Don't override iso-2022-jp with us-ascii.

diff --git a/rfc2047.c b/rfc2047.c
index 01358f6a5bde645b800e17c2287957cc8229ce25..786803aa3da579883fd5cc09ec5be15861a4be5a 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -41,7 +41,7 @@ static void q_encode_string (char *d,
   for(t = s; *t && !hibit; t++)
     if(*t & 0x80) hibit = 1;
 
-  if(hibit)
+  if(hibit || !mutt_strcasecmp (send_charset, "iso-2022-jp"))
   {
     snprintf (charset, sizeof (charset), "=?%s?Q?",
              mutt_strcasecmp ("us-ascii", send_charset) == 0 ? "unknown-8bit" : NONULL(send_charset));

diff --git a/sendlib.c b/sendlib.c
index e089e1f5fbf3a9eb5a3091941f893d8c2c0a2387..1181ad1e78878e7873b6936eaac8ea6cc1bd2199 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -852,6 +852,9 @@ static const char *get_text_charset (BODY *b, CONTENT *info)
   if (info->hibin || !strcasecmp (chsname, "utf-7"))
     return (chsname);
 
+  if (info->lobin && !strcasecmp (chsname, "iso-2022-jp"))
+    return (chsname);
+  
   return ("us-ascii");
 }