X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=c595af694a17b8ca5b6ec5ec170df12201aa4a7c;hp=3f223a6e40ecc047fbaddd3591c9f02165fdb546;hb=6eb22b54ec44fd63bea311f472c9aadc7176c230;hpb=68d92974c5785799ffb24f6577ae030594f91b29

diff --git a/muttlib.c b/muttlib.c
index 3f223a6..c595af6 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -278,13 +278,7 @@ int mutt_check_overwrite (const char *attname, const char *path,
 void mutt_save_path(char *d, ssize_t dsize, address_t *a)
 {
     if (a && a->mailbox) {
-        m_strcpy(d, dsize, a->mailbox);
-
-        if (!option(OPTSAVEADDRESS)) {
-            char *p = strpbrk(d, "%@");
-            if (p)
-                *p = '\0';
-        }
+        m_strncpy(d, dsize, a->mailbox, strcspn(d, "%@"));
         m_strtolower(d);
     } else {
         *d = '\0';