fix bug 6740. approved by christ hofmann. reviewed by harish. This is a temp fix. ftang should move this hack out of parser after M6

htmlparser/src/nsParser.cpp

@@ -622,6 +622,13 @@ nsresult nsParser::Parse(nsIURL* aURL,nsIStreamObserver* aListener,PRBool aVerif
     if (rv != NS_OK) return rv;
     nsAutoString theName(spec);
 
+    // Temp hack to prevent reload on mail message
+    if(-1 != theName.Find("tempMessage.eml"))
+    {
+      nsAutoString utf8("UTF-8");
+      SetDocumentCharset(utf8, kCharsetFromPreviousLoading);
+    }
+
     CParserContext* pc=new CParserContext(new nsScanner(theName,PR_FALSE, mCharset, mCharsetSource),aKey,aListener);
     if(pc) {
       pc->mMultipart=PR_TRUE;

parser/htmlparser/src/nsParser.cpp

@@ -622,6 +622,13 @@ nsresult nsParser::Parse(nsIURL* aURL,nsIStreamObserver* aListener,PRBool aVerif
     if (rv != NS_OK) return rv;
     nsAutoString theName(spec);
 
+    // Temp hack to prevent reload on mail message
+    if(-1 != theName.Find("tempMessage.eml"))
+    {
+      nsAutoString utf8("UTF-8");
+      SetDocumentCharset(utf8, kCharsetFromPreviousLoading);
+    }
+
     CParserContext* pc=new CParserContext(new nsScanner(theName,PR_FALSE, mCharset, mCharsetSource),aKey,aListener);
     if(pc) {
       pc->mMultipart=PR_TRUE;