diff --git a/mozilla/mailnews/base/util/nsMsgI18N.cpp b/mozilla/mailnews/base/util/nsMsgI18N.cpp index 352f130c7f4..d7ea1afbeea 100644 --- a/mozilla/mailnews/base/util/nsMsgI18N.cpp +++ b/mozilla/mailnews/base/util/nsMsgI18N.cpp @@ -319,7 +319,9 @@ nsresult ConvertToUnicode(const nsString& aCharset, } } if (NS_FAILED(res)) { - return res; + // ignore charset alias error and use fallback charset. + convCharset = NS_LITERAL_STRING("ISO-8859-1").get(); + res = NS_OK; } NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);