Fix for bug 173046. fix initialization of the text filter service. Editor commands also takes care of msg compose spell button. R=rods, SR=sspitzer

editor/composer/src/nsComposerRegistration.cpp

@@ -90,7 +90,7 @@ nsComposeTxtSrvFilterConstructorForComposer(nsISupports *aOuter,
                                             REFNSIID aIID,
                                             void **aResult)
 {
-    return nsComposeTxtSrvFilterConstructor(aOuter, aIID, aResult, PR_TRUE);
+    return nsComposeTxtSrvFilterConstructor(aOuter, aIID, aResult, PR_FALSE);
 }
 
 static NS_IMETHODIMP
@@ -98,7 +98,7 @@ nsComposeTxtSrvFilterConstructorForMail(nsISupports *aOuter,
                                         REFNSIID aIID,
                                         void **aResult)
 {
-    return nsComposeTxtSrvFilterConstructor(aOuter, aIID, aResult, PR_FALSE);
+    return nsComposeTxtSrvFilterConstructor(aOuter, aIID, aResult, PR_TRUE);
 }
 
 NS_IMETHODIMP nsEditorDocStateControllerConstructor(nsISupports *aOuter, REFNSIID aIID, 

editor/ui/composer/content/ComposerCommands.js

@@ -2395,8 +2395,9 @@ var nsSpellingCommand =
   {
     window.cancelSendMessage = false;
     try {
+      var spellCheckMail = (window.document.firstChild.getAttribute("windowtype") == "msgcompose");
       window.openDialog("chrome://editor/content/EdSpellCheck.xul", "_blank",
-              "chrome,close,titlebar,modal", false);
+              "chrome,close,titlebar,modal", spellCheckMail);
     }
     catch(ex) {}
     window.content.focus();