diff --git a/mailnews/compose/resources/content/askSendFormat.js b/mailnews/compose/resources/content/askSendFormat.js
index 971babeb046d..68dea229f148 100644
--- a/mailnews/compose/resources/content/askSendFormat.js
+++ b/mailnews/compose/resources/content/askSendFormat.js
@@ -24,6 +24,7 @@ var param = null;
 var defaultAction = msgCompSendFormat.PlainText;
 var recommended_as_default = true;
 var display_recommendation = true;
+var useDefault =false;
 
 var prefs = Components.classes["@mozilla.org/preferences;1"].getService();
 if (prefs) {
@@ -31,6 +32,7 @@ if (prefs) {
   if (prefs) {
     try {
       defaultAction = prefs.GetIntPref("mail.asksendformat.default");
+      useDefault = true;
     } catch (ex) {}
     try {
       recommended_as_default = prefs.GetBoolPref("mail.asksendformat.recommended_as_default");
@@ -87,7 +89,13 @@ function Startup()
       var recommlabels = document.getElementById("hiddenLabels");
       var label;
       var haveRecommendation = false;
-      switch (param.action)
+
+      if (useDefault)
+        var radioSelect=defaultAction;
+      else
+        var radioSelect=param.action;
+
+      switch (radioSelect)
       {
         case msgCompSendFormat.AskUser:
           //haveRecommendation = false;
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 9a53e83062ea..95aaca7af499 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -88,6 +88,8 @@
   <commandset id="tasksCommands"/>
   <command id="cmd_quit"/>
   <!-- File Menu -->
+  <command id="cmd_newNavigator"/>
+  <command id="cmd_newEditor"/>
   <command id="cmd_new" oncommand="goDoCommand('cmd_newMessage')"/>
   <command id="cmd_attachFile" oncommand="goDoCommand('cmd_attachFile')"/>
   <command id="cmd_attachPage" oncommand="goDoCommand('cmd_attachPage')"/>