fix forward inline with non-default charset, r/sr=bienvenu, bug 494912
authorPhilippe Prados <bugzilla@prados.fr>
Tue, 20 Apr 2010 12:39:04 -0700
changeset 5485 60e7a12dcc96
parent 5484 399bdce3f814
child 5486 e66f19ee877e
push id4241
push userbienvenu@nventure.com
push date2010-04-20 19:38 +0000
treeherdercomm-central@60e7a12dcc96 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs494912
fix forward inline with non-default charset, r/sr=bienvenu, bug 494912
mailnews/compose/src/nsMsgComposeService.cpp
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -565,16 +565,17 @@ nsMsgComposeService::OpenComposeWindow(c
     || type == nsIMsgCompType::ReplyWithTemplate || type == nsIMsgCompType::Redirect)
   {
     nsCAutoString uriToOpen(originalMsgURI);
     uriToOpen += (uriToOpen.FindChar('?') == kNotFound) ? "?" : "&";
     uriToOpen.Append("fetchCompleteMessage=true");
     if (type == nsIMsgCompType::Redirect)
       uriToOpen.Append("&redirect=true");
 
+    aMsgWindow->SetCharsetOverride(true);
     return LoadDraftOrTemplate(uriToOpen, type == nsIMsgCompType::ForwardInline || type == nsIMsgCompType::Draft ?
                                nsMimeOutput::nsMimeMessageDraftOrTemplate : nsMimeOutput::nsMimeMessageEditorTemplate,
                                identity, originalMsgURI, origMsgHdr, type == nsIMsgCompType::ForwardInline,
                                format == nsIMsgCompFormat::OppositeOfDefault, aMsgWindow);
   }
 
   nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
   if (NS_SUCCEEDED(rv) && pMsgComposeParams)