Excluded types MESSAGE_RFC822 and MESSAGE_NEWS from being encoded as base64 to fix forward inline problem, bug 40745, r=rhp, a=ftang.

mailnews/compose/src/nsMsgAttachmentHandler.cpp

@@ -273,9 +273,7 @@ nsMsgAttachmentHandler::PickEncoding(const char *charset)
         (PL_strcasecmp(m_type, TEXT_VCARD) == 0) ||
         (PL_strcasecmp(m_type, APPLICATION_DIRECTORY) == 0) || /* text/x-vcard synonym */
         (PL_strcasecmp(m_type, TEXT_CSS) == 0) ||
-        (PL_strcasecmp(m_type, TEXT_JSSS) == 0) ||
+        (PL_strcasecmp(m_type, TEXT_JSSS) == 0)))
-        (PL_strcasecmp(m_type, MESSAGE_RFC822) == 0) ||
-        (PL_strcasecmp(m_type, MESSAGE_NEWS) == 0)))
       {
         needsB64 = PR_TRUE;
       }

mailnews/compose/src/nsMsgCompUtils.cpp

@@ -816,9 +816,7 @@ mime_generate_attachment_headers (const char *type, const char *encoding,
          (PL_strcasecmp(type, TEXT_VCARD) == 0) ||
          (PL_strcasecmp(type, APPLICATION_DIRECTORY) == 0) || /* text/x-vcard synonym */
          (PL_strcasecmp(type, TEXT_CSS) == 0) ||
-         (PL_strcasecmp(type, TEXT_JSSS) == 0) ||
+         (PL_strcasecmp(type, TEXT_JSSS) == 0)) ||
-         (PL_strcasecmp(type, MESSAGE_RFC822) == 0) ||
-         (PL_strcasecmp(type, MESSAGE_NEWS) == 0)) ||
          (PL_strcasecmp(encoding, ENCODING_BASE64) != 0)) &&
          (*charset_label))
     {