X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc2231.c;h=e1eec1e6c1100c373e41052e4fa1bcbef3cdbce3;hp=ff6a02c8a57073cc4bb7af5a0d31428a1075352a;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=22601f25ede6703ba7cd06ee84eddd2045308570

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index ff6a02c..e1eec1e 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -141,7 +141,7 @@ static void purge_empty_parameters(PARAMETER **headp)
         if (!p->attribute || !p->value) {
             *headp = p->next;
             p->next = NULL;
-            parameter_delete(&p);
+            parameter_list_wipe(&p);
         } else {
             headp = &(*headp)->next;
         }
@@ -242,8 +242,8 @@ void rfc2231_decode_parameters (PARAMETER ** headp)
             if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
                 rfc2047_decode (&p->value);
             else if (!option (OPTSTRICTMIME)) {
-                if (ascii_strcasecmp (AssumedCharset, "us-ascii"))
-                    mutt_convert_nonmime_string (&p->value);
+                if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
+                    mutt_convert_nonmime_string(&p->value);
             }
 
             *last = p;