diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index f9d4e5a031f5..efef18fc0d88 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -29,7 +29,7 @@ Rights Reserved.
 
   <!-- Addressing Widget -->
   <tree id="addressingWidgetTree"
-    class="addressingWidget inset" multiple="true"
+    class="addressingWidget inset toolbar" multiple="true"
     onkeydown="awKeyDown(event, this)"
     onclick="awClickEmptySpace(event.originalTarget, true)"
     ondragover="return DragOverTree(event);"
@@ -43,7 +43,7 @@ Rights Reserved.
     <treechildren flex="1" id="addressWidgetBody">
       <treeitem>
         <treerow>
-          <treecell class="treecell-addressingWidget" allowevents="true">
+          <treecell class="treecell-addressingWidget" allowevents="true" autostretch="always">
             <menulist id="msgRecipientType#1" class="aw-menulist menulist-compact" flex="1"
                       onclick="awNotAnEmptyArea(event)" 
                       oncommand="awSetAutoComplete(this.id.slice(this.id.lastIndexOf('#') + 1));">
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 3945c2bf5e93..1df532932d76 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -456,7 +456,7 @@
           <tree id="addressingWidgetTree" flex="1"/>
           <box autostretch="never">
             <text class="label" value="&subject.label;" accesskey="&subject.accesskey;"/>
-            <textbox id="msgSubject" flex="1" onkeyup="SetComposeWindowTitle(event.which);"
+            <textbox id="msgSubject" flex="1" class="toolbar" onkeyup="SetComposeWindowTitle(event.which);"
                        onkeypress="subjectKeyPress(event);" onchange="contentChanged=true;"/>
           </box>
         </box>
@@ -464,7 +464,7 @@
         <box orient="vertical" flex="25">
           <text class="label" id="attachmentBucketText" value="&attachments.label;" crop="right"
                 accesskey="&attachments.accesskey;"/>
-          <tree id="attachmentBucket" class="inset toolbar-focustarget" flex="1" style="height: 0px; width: 0px;"
+          <tree id="attachmentBucket" class="inset toolbar" flex="1" style="height: 0px; width: 0px;"
                 dragdroptree="true"
                 onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveSelectedAttachment();"
                 onchange="contentChanged=true;"
@@ -499,13 +499,9 @@
       <button id="outdentButton"/>
       <button id="indentButton"/>
       <toolbarseparator class="toolbarseparator-standard"/>
-    
       <menubutton id="AlignPopupButton"/>
-    
       <menubutton id="InsertPopupButton"/>
-
-    <menu id="smileButtonMenu"/>
-
+      <menubutton id="smileButtonMenu"/>
       <spring flex="1"/>
     </toolbar>
   </toolbox>
diff --git a/themes/classic/messenger/messengercompose/messengercompose.css b/themes/classic/messenger/messengercompose/messengercompose.css
index cb4e0ca30359..0a3ec846cf8e 100644
--- a/themes/classic/messenger/messengercompose/messengercompose.css
+++ b/themes/classic/messenger/messengercompose/messengercompose.css
@@ -30,17 +30,12 @@
     height                : 80px;
     width                 : 0px;
     -moz-user-focus       : none;
+    background-color      : -moz-field;
   }  
   
-#addressingWidgetTree > .tree-container-treerows
-  {
-    border-left: none;
-  }
-
 #listcol-addressingWidget 
   {
     width                 : 9em;
-    border-left           : 1px solid ThreeDDarkShadow;
     border-right          : 1px solid #CACAFF;
   }
   
@@ -249,7 +244,7 @@
 
 #appcontent
   {
-    border-left           : 1px solid ThreeDDarkShadow;
+    border-left           : 1px solid ThreeDShadow;
     border-right          : 1px solid ThreeDHighlight;
     border-top            : 1px solid ThreeDShadow;
   }  
diff --git a/themes/modern/global/toolbar.css b/themes/modern/global/toolbar.css
index bf2f0fceb126..8d8548779461 100644
--- a/themes/modern/global/toolbar.css
+++ b/themes/modern/global/toolbar.css
@@ -122,7 +122,7 @@ toolbarseparator {
 
 /* ::::: special looks for widgets in toolbars ::::: */
 
-tree.toolbar,
+tree.toolbar.inset,
 textbox.toolbar {
   border-top: 1px solid #536B86;
   border-right: 1px solid #94A6B9;
@@ -130,7 +130,7 @@ textbox.toolbar {
   border-left: 1px solid #536B86;
 }
 
-tree.toolbar > .tree-container-treerows,
+tree.toolbar.inset > .tree-container-treerows,
 textbox.toolbar > .textbox-internal-box {
   border-color: #364556;
 }
diff --git a/themes/modern/messenger/messengercompose/messengercompose.css b/themes/modern/messenger/messengercompose/messengercompose.css
index bc323ba4983e..7cc5da4adf9b 100644
--- a/themes/modern/messenger/messengercompose/messengercompose.css
+++ b/themes/modern/messenger/messengercompose/messengercompose.css
@@ -167,28 +167,6 @@
 
 /* ..... border adjustments to match toolbar colors ..... */
 
-#attachmentBucket,
-#addressingWidgetTree,
-#msgSubject {
-  border-top: 1px solid #536B86;
-  border-right: 1px solid #94A6B9;
-  border-bottom: 1px solid #94A6B9;
-  border-left: 1px solid #536B86;
-}
-
-#msgSubject > .textbox-internal-box {
-  border-color: #364556;
-}
-
-#msgSubject[focused="true"] {
-  border: 1px solid #2D3B49;
-}
-
-#addressingWidgetTree > .tree-container-treerows {
-  border-top: none;
-  border-left: none;
-}
-
 #compose-toolbar-sizer {
   border-top: none;
 }
@@ -209,7 +187,6 @@
 
 #addressingWidgetTree {
   -moz-user-focus: none;
-  border: 1px inset #5B7693;
   width: 0px;
   height: 80px;
 }
@@ -234,7 +211,6 @@
 
 .treecell-addressingWidget:first-child {
   border-top: none;
-  border-bottom: none;
 }
 
 .dummy-row-cell:first-child {