diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index a67b04a6ed69..3dbfd1b40be6 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -104,6 +104,7 @@ Rights Reserved.
 
 <popupset id="aTooltipSet"/>
 
+<toolbox class="toolbox-top">
 	<menubar>
 		<menu id="menu_File">
 			<menupopup id="menu_FilePopup">
@@ -219,7 +220,6 @@ Rights Reserved.
 	</menubar>
 	
 	<!-- toolbar -->
-	<toolbox>
 		<toolbar class="toolbar-primary" id="abToolbar" persist="collapsed">
 			<box id="toolbar_button_box">
 				<button class="button-toolbar-2 top" orient="vertical" id="button-newcard" value="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" onclick="AbNewCard()"/>
@@ -278,7 +278,7 @@ Rights Reserved.
 		
 	</box>
 	
-	<toolbar id="taskbar"/>
+	<toolbox id="taskbar" class="toolbox-bottom"/>
 
 </window>
 
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 7bd72b9e4cf0..b45632f4a843 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -309,10 +309,10 @@ Rights Reserved.
 
 
 
+  <toolbox id="mailToolbarToolbox" class="toolbox-top">
     <menubar id="mailMenubar"/>
+  </toolbox>
 
-
-	<toolbox id="mailToolbarToolbox"/>
   <!-- The main mail three pane frame -->
 
 
@@ -357,7 +357,7 @@ Rights Reserved.
 		</box>
 	</box>
 
-	<toolbar id="taskbar"/>
+	<toolbox id="taskbar" class="toolbox-bottom"/>
 
 </window>
 
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 218a94364cfc..cc4b697f307c 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -174,6 +174,7 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
 </popupset>
 
 <!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
+<toolbox class="toolbox-top">
   <menubar>
 	<menu id="menu_File">
       <menupopup id="menu_FilePopup">
@@ -401,7 +402,6 @@ END of Deprecated -->
 	<menu id="menu_Help"/>
 	<spring flex="100%"/>
   </menubar>
-  <toolbox>
     <toolbar class="toolbar-primary" id="composeToolbar" persist="collapsed">
 		<box id="toolbar_button_box">
 	 		<button class="button-toolbar-2 top" id="button-send" value="&sendButton.label;" tooltip="aTooltip" tooltiptext="&sendButton.tooltip;"  onclick="SendMessage()"/>
@@ -534,6 +534,6 @@ END of Deprecated -->
     </box>
 
 <!-- /box -->
-	<toolbar id="taskbar"/>
+	<toolbox id="taskbar" class="toolbox-bottom"/>
 </window>