X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=51f4c32c56e7c7be0afcfc4dd1f115c5812afe92;hp=59c70de211a1fce93d6f1be6f0d613e70f681e9e;hb=4e64abbe6c52d61bb01b85c266e33e30b257ba68;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91

diff --git a/handler.c b/handler.c
index 59c70de..51f4c32 100644
--- a/handler.c
+++ b/handler.c
@@ -1250,12 +1250,11 @@ void mutt_decode_attachment (BODY * b, STATE * s)
     if (s->flags & M_CHARCONV) {
       const char *charset = parameter_getval(b->parameter, "charset");
 
-      if (!option (OPTSTRICTMIME) && !charset)
+      if (!charset)
         charset = charset_getfirst(AssumedCharset);
       if (charset && Charset)
         cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
-    }
-    else {
+    } else {
       if (b->file_charset)
         cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
     }