diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js
index a69bc7d36ee..3823dedf451 100644
--- a/mozilla/mail/components/compose/content/MsgComposeCommands.js
+++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js
@@ -234,9 +234,7 @@ var gComposeRecyclingListener = {
       identityElement.focus();
 
     InitializeGlobalVariables();
-    window.content.focus();
-    ComposeStartup(true, params);
-    enableEditableFields();
+    ComposeStartup(true, params);    
 
     var event = document.createEvent('Events');
     event.initEvent('compose-window-reopen', false, true);
@@ -1105,6 +1103,7 @@ function ComposeFieldsReady(msgType)
   }
   CompFields2Recipients(gMsgCompose.compFields, gMsgCompose.type);
   SetComposeWindowTitle();
+  enableEditableFields();
   AdjustFocus();
 }
 
diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index 419be0d81db..b644bb2dafb 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -466,6 +466,7 @@
             <menulist id="msgIdentity" label="..." flex="1" oncommand="LoadIdentity(false);">
               <menupopup id="msgIdentityPopup"/>
             </menulist>
+            <spacer flex="1000"/>
           </hbox> 
           <listbox id="addressingWidget" flex="1"/>
           <hbox align="center">