X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=handler.c;h=251f4795ec0352ec78485f4aaefe99b14ced8bb6;hb=be2ccfaadec4e4f6e059007247c18ffb372a05a4;hp=09556d18fa08544bd5bfdbe176383de66be8af99;hpb=fbce8661618b322f5cfd8efd6ead47163b04d69a;p=apps%2Fmadmutt.git

diff --git a/handler.c b/handler.c
index 09556d1..251f479 100644
--- a/handler.c
+++ b/handler.c
@@ -1870,11 +1870,21 @@ void mutt_decode_attachment (BODY *b, STATE *s)
 
   Quotebuf[0] = '\0';
 
-  if (istext && s->flags & M_CHARCONV)
+  if (istext)
   {
-    char *charset = mutt_get_parameter ("charset", b->parameter);
-    if (charset && Charset)
-      cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+    if(s->flags & M_CHARCONV)
+    {
+      char *charset = mutt_get_parameter ("charset", b->parameter);
+      if (!option (OPTSTRICTMIME) && !charset)
+        charset = mutt_get_first_charset (AssumedCharset);
+      if (charset && Charset)
+        cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+    }
+    else
+    {
+      if (b->file_charset)
+        cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
+    }
   }
 
   fseek (s->fpin, b->offset, 0);