X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Frfc2231.c;h=7cd45d286b272877f1584ee20816b2333403a369;hb=c621d41d614275fb6265ab8184a825a72b5a52b4;hp=206f50540650cc6a923ce3e1b7b9664998e94408;hpb=69f4685e616347559d4ec714fd826d7f97a472ef;p=apps%2Fmadmutt.git

diff --git a/lib-mime/rfc2231.c b/lib-mime/rfc2231.c
index 206f505..7cd45d2 100644
--- a/lib-mime/rfc2231.c
+++ b/lib-mime/rfc2231.c
@@ -36,13 +36,7 @@
  *
  */
 
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
@@ -239,9 +233,9 @@ void rfc2231_decode_parameters (parameter_t ** headp)
              * Internet Gateways.  So we actually decode it.
              */
 
-            if (option (OPTRFC2047PARAMS) && p->value && strstr (p->value, "=?"))
-                rfc2047_decode (&p->value);
-            else if (!option (OPTSTRICTMIME)) {
+            if (p->value && strstr(p->value, "=?")) {
+                rfc2047_decode(&p->value);
+            } else {
                 if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII)
                     mutt_convert_nonmime_string(&p->value);
             }