When Charset is utf-8 (not recommended!), don't active utf8

translation in the various handler routines.

diff --git a/handler.c b/handler.c
index fa699cf741220e2fd562450c1bfbc014f37eb9ff..abde7b198505a45a3b5e81c9459b9dbf1c760279 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -85,7 +85,7 @@ void mutt_decode_xbit (STATE *s, BODY *b, int istext)
     char *charset = mutt_get_parameter("charset", b->parameter);
     int is_utf8;
 
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset)))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);
@@ -141,7 +141,7 @@ void mutt_decode_quoted (STATE *s, BODY *b, int istext)
   
   if(istext)
   {
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset))))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);
@@ -223,7 +223,7 @@ void mutt_decode_base64 (STATE *s, BODY *b, int istext)
 
   if(istext)
   {
-    if((is_utf8 = mutt_is_utf8(charset)))
+    if((is_utf8 = (mutt_is_utf8(charset) && !mutt_is_utf8(Charset))))
       chs = mutt_get_charset(Charset);
     else
       map = mutt_get_translation(charset, Charset);