diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index df54c40020e..4e20ba46ac3 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -206,6 +206,7 @@ var defaultController =
       case "cmd_showFormatToolbar":
 
       //Insert Menu
+      case "cmd_renderedHTMLEnabler":
       case "cmd_insert":
       case "cmd_link":
       case "cmd_anchor":
@@ -324,6 +325,7 @@ var defaultController =
         return composeHTML;
 
       //Insert Menu
+      case "cmd_renderedHTMLEnabler":
       case "cmd_insert":
         return !focusedElement;
       case "cmd_link":
@@ -984,10 +986,11 @@ function ComposeStartup()
 			else
 			{
 		    //Remove HTML toolbar, format and insert menus as we are editing in plain text mode
-		    document.getElementById("FormatToolbar").setAttribute("hidden", true);
-		    document.getElementById("formatMenu").setAttribute("hidden", true);
-		    document.getElementById("insertMenu").setAttribute("hidden", true);
-		    document.getElementById("menu_showFormatToolbar").setAttribute("checked", false);
+        document.getElementById("outputFormatMenu").setAttribute("hidden", true);
+        document.getElementById("FormatToolbar").setAttribute("hidden", true);
+        document.getElementById("formatMenu").setAttribute("hidden", true);
+        document.getElementById("insertMenu").setAttribute("hidden", true);
+        document.getElementById("menu_showFormatToolbar").setAttribute("hidden", true);
 
 				window.editorShell.editorType = "textmail";
 //				dump("editor initialized in PLAIN TEXT mode\n");
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index b46f1940b52..0f1c93ce523 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -338,7 +338,7 @@
           <!--menuitem label="&quoteOrigCmd.label;" accesskey="&quoteOrigCmd.accesskey;" command="cmd_quoteMessage"/-->  
           <menuitem label="&editRewrapCmd.label;" accesskey="&editRewrapCmd.accesskey;" command="cmd_rewrap" oncommand="editorShell.Rewrap(false)"/>
           <menuseparator/>
-          <menu label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" command="cmd_outputFormat">
+          <menu id="outputFormatMenu" label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" command="cmd_outputFormat">
             <menupopup>
               <menuitem type="radio" name="output_format" label="&autoFormatCmd.label;" accesskey="&autoFormatCmd.accesskey;" id="1" checked="true"/>
               <menuitem type="radio" name="output_format" label="&plainTextFormatCmd.label;" accesskey="&plainTextFormatCmd.accesskey;" id="2"/>