fix forward inline with non-default charset, r/sr=bienvenu,
bug 494912
--- 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)