diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index a5e710fbc7e9..f071f84621f6 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -92,27 +92,29 @@ Contributor(s):
   </groupbox>
 
   <!-- toolbar buttons customization -->
-  <groupbox id="showButtons">
+  <groupbox flex="1" id="showButtons" orient="horizontal">
     <caption label="&toolbarIntro.label;"/>
-    <hbox id="showButtonsBox">
+    <vbox id="showButtonsBox1">
       <checkbox id="fileButton"
                 label="&fileButton.label;"
                 prefstring="mail.toolbars.showbutton.file"/>
       <checkbox id="nextButton"
                 label="&nextButton.label;"
                 prefstring="mail.toolbars.showbutton.next"/>
+      <checkbox id="printButton"
+                label="&printButton.label;"
+                prefstring="mail.toolbars.showbutton.print"/>
+    </vbox>
+    <vbox id="showButtonsBox2">
+      <checkbox id="stopButton"
+                label="&stopButton.label;"
+                prefstring="mail.toolbars.showbutton.stop"/>
 <!-- not ready yet
       <checkbox id="junkMailButton"
                 label="&junkMailButton.label;"
                 prefstring="mail.toolbars.showbutton.junk"/>
 -->
-      <checkbox id="printButton"
-                label="&printButton.label;"
-                prefstring="mail.toolbars.showbutton.print"/>
-      <checkbox id="stopButton"
-                label="&stopButton.label;"
-                prefstring="mail.toolbars.showbutton.stop"/>
-    </hbox>
+    </vbox>
   </groupbox>
  
 </page>
diff --git a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
index 442e3df55cfa..e07523d631e9 100644
--- a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@@ -33,7 +33,7 @@ Rights Reserved.
 <!ENTITY useDefault.accesskey             "R">
 <!ENTITY rememberLastMsg.label            "Remember the last selected message">
 <!ENTITY rememberLastMsg.accesskey        "e">
-<!ENTITY toolbarIntro.label               "Display the following toolbar buttons">
+<!ENTITY toolbarIntro.label               "Select the buttons you want to see in the toolbar">
 <!ENTITY fileButton.label                 "File">
 <!ENTITY nextButton.label                 "Next">
 <!ENTITY junkMailButton.label             "Junk Mail">
diff --git a/mailnews/base/resources/content/mailWindow.js b/mailnews/base/resources/content/mailWindow.js
index 53877ce9453a..b5989627df76 100644
--- a/mailnews/base/resources/content/mailWindow.js
+++ b/mailnews/base/resources/content/mailWindow.js
@@ -628,7 +628,7 @@ function ShowHideToolBarButtons()
 
   if (prefArray && (prefCount.value > 0)) {
     for (var i=0;i < prefCount.value;i++) {
-      hideButton(prefArray[i],prefBranch.getBoolPref(prefArray[i]));
+      document.getElementById("button-" + prefArray[i]).hidden = !(prefBranch.getBoolPref(prefArray[i]));
     }
   }
 }
@@ -662,13 +662,7 @@ const gMailToolBarPrefListener =
     // verify that we're changing a button pref
     if (topic != "nsPref:changed")
       return;
-    var buttonName = prefName.substr(this.domain.length+1);
 
-    hideButton(buttonName,pref.getBoolPref(prefName))
+    document.getElementById("button-" + prefName.substr(this.domain.length+1)).hidden = !(pref.getBoolPref(prefName));
   }
 };
-
-function hideButton(name,show)
-{
-  document.getElementById("button-" + name).setAttribute("hidden", show ? "false":"true");
-}
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 84e3fee60088..bd35cbad68a6 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1064,7 +1064,7 @@ Rights Reserved.
            oncommand="goToggleToolbar('searchBox', 'menu_showSearchToolbar'); SearchBarToggled();"
            checked="true"/>
           <menuitem type="checkbox" id="menu_showTaskbar"/>
-          <menuseparator/>
+          <menuseparator id="menu_showSearch_showMessage_Separator"/>
           <menuitem id="menu_showMessage"
            type="checkbox"
            label="&showMessageCmd.label;"
@@ -1493,7 +1493,7 @@ Rights Reserved.
       <toolbarbutton class="toolbarbutton-1" id="button-forward" label="&forwardButton.label;" tooltiptext="&forwardButton.tooltip;" observes="button_forward" oncommand="MsgForwardMessage(event)"/>
       <toolbarseparator class="toolbarseparator-primary"/>
       <toolbarbutton type="menu" id="button-file" class="toolbarbutton-1" 
-                  label="&fileButton.label;" persist="hidden" hidden="true" observes="button_file"
+                  label="&fileButton.label;" observes="button_file"
                   datasources="rdf:null" 
                   tooltiptext="&fileButton.tooltip;"
                   sortResource="http://home.netscape.com/NC-rdf#FolderTreeName" sortDirection="ascending">
@@ -1559,10 +1559,10 @@ Rights Reserved.
         </template>
         <menupopup/>
       </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" hidden="true" persist="hidden" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
       <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/>
 <!-- not ready yet
-      <toolbarbutton class="toolbarbutton-1" id="button-junk" label="&junkButton.label;" persist="hidden" tooltiptext="&junkButton.tooltip;" observes="button_junk" oncommand="goDoCommand('button_junk')"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-junk" label="&junkButton.label;" tooltiptext="&junkButton.tooltip;" observes="button_junk" oncommand="goDoCommand('button_junk')"/>
 -->
       <toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"
                   observes="button_mark" tooltiptext="&markButton.tooltip;">  
@@ -1574,13 +1574,13 @@ Rights Reserved.
                 <menuitem type="checkbox" id="markFlaggedToolbarItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
             </menupopup>
       </toolbarbutton>
-      <toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;" persist="hidden"
+      <toolbarbutton id="button-print" type="menu-button" class="toolbarbutton-1" label="&printButton.label;"
                   observes="button_print" oncommand="goDoCommand('cmd_print')" tooltiptext="&printButton.tooltip;">  
         <menupopup id="printMenu">
           <menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" default="true"/>
           </menupopup>
       </toolbarbutton>
-      <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" persist="hidden" tooltiptext="&stopButton.tooltip;" command="cmd_stop"/>
+      <toolbarbutton class="toolbarbutton-1" id="button-stop" label="&stopButton.label;" tooltiptext="&stopButton.tooltip;" command="cmd_stop"/>
       <spacer flex="1"/>
             <hbox id="throbber-box" align="center">
                 <button id="navigator-throbber" oncommand="goClickThrobber('messenger.throbber.url')" tooltiptext="&throbber.tooltip;"/>