From 2fa80f2084d3678cac0cc60e116cc98df541f95d Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Apr 2003 18:35:08 +0000
Subject: [PATCH] land some trunk bug fixes

git-svn-id: svn://10.0.0.236/trunk@140987 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mail/components/compose/content/MsgComposeCommands.js    | 5 ++---
 mozilla/mail/components/compose/content/messengercompose.xul | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

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">