a=ben, partial fixes for bugs 38840, 41535 and Mail3PaneVertlayout

l10n/langpacks/en-DE/chrome/en-DE/messenger/locale/messenger.dtd

@@ -131,7 +131,7 @@ Rights Reserved.
 <!ENTITY reloadCmd.label ".Reload">  
 <!ENTITY showImagesCmd.label ".Show Images">  
 <!ENTITY stopCmd.label ".Stop">  
-<!ENTITY pageSourceCmd.label "Page Source">  
+<!ENTITY pageSourceCmd.label "Message Source">  
 <!ENTITY pageInfoCmd.label ".Page Info">  
 <!ENTITY charSetMenu.label "Character Set"> 
 <!ENTITY translateMenu.label ".Translate"> 

l10n/langpacks/en-GB/chrome/en-GB/messenger/locale/messenger.dtd

@@ -131,7 +131,7 @@ Rights Reserved.
 <!ENTITY reloadCmd.label ".Reload">  
 <!ENTITY showImagesCmd.label ".Show Images">  
 <!ENTITY stopCmd.label ".Stop">  
-<!ENTITY pageSourceCmd.label "Page Source">  
+<!ENTITY pageSourceCmd.label "Message Source">  
 <!ENTITY pageInfoCmd.label ".Page Info">  
 <!ENTITY charSetMenu.label "Character Set"> 
 <!ENTITY translateMenu.label ".Translate"> 

mailnews/base/resources/content/mail3PaneWindowVertLayout.xul

@@ -114,10 +114,9 @@ Rights Reserved.
 </popupset>
 
 
+  <toolbox id="mailToolbarToolbox" class="toolbox-top">
     <menubar id="mailMenubar"/>
-
-
-	<toolbox id="mailToolbarToolbox"/>
+  </toolbox>
   <!-- The main mail three pane frame -->
 
 

mailnews/base/resources/locale/en-US/messenger.dtd

@@ -159,8 +159,8 @@ Rights Reserved.
 <!ENTITY reloadCmd.accesskey "r">  
 <!ENTITY stopCmd.label "Stop">  
 <!ENTITY stopCmd.accesskey "s">  
-<!ENTITY pageSourceCmd.label "Page Source">  
-<!ENTITY pageSourceCmd.accesskey "u">  
+<!ENTITY pageSourceCmd.label "Message Source">  
+<!ENTITY pageSourceCmd.accesskey "o">  
 <!ENTITY pageSourceCmd.key "u">  
 <!ENTITY translateMenu.label ".Translate"> 
 <!ENTITY dcharMenu.label "Character Set  ISO">