X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc822parse.c;h=b1a2d391c02b5c739ba0895384d534cae51a67f8;hp=0b674793a30f711837b0ea176c617fbf6b2b0ce8;hb=9946738a6a1c27a5602a14d1afe2eea2389732b2;hpb=926c11d6cc2cf92ec20792edaef2608d3f3b198b

diff --git a/lib-mime/rfc822parse.c b/lib-mime/rfc822parse.c
index 0b67479..b1a2d39 100644
--- a/lib-mime/rfc822parse.c
+++ b/lib-mime/rfc822parse.c
@@ -331,7 +331,7 @@ void mutt_parse_content_type(char *s, BODY *ct)
         pc = parameter_getval(ct->parameter, "charset");
         if (!pc) {
             parameter_setval(&ct->parameter, "charset",
-                             charset_getfirst(AssumedCharset));
+                             charset_getfirst(mod_cset.assumed_charset));
         }
     }
 }
@@ -1034,15 +1034,12 @@ mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
         {
             /* if spam tag already exists, figure out how to amend it */
             if (e->spam && *buf) {
-                if (SpamSep) {
-                    /* If SpamSep defined, append with separator */
-                    mutt_buffer_addstr(e->spam, SpamSep);
-                    mutt_buffer_addstr(e->spam, buf);
+                if (mod_mime.spam_separator) {
+                    mutt_buffer_addstr(e->spam, mod_mime.spam_separator);
                 } else {
-                    /* else overwrite */
                     mutt_buffer_reset(e->spam);
-                    mutt_buffer_addstr(e->spam, buf);
                 }
+                mutt_buffer_addstr(e->spam, buf);
             }
 
             if (!e->spam) {