diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 808b2ed0fd0..daab7f9c678 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -27,14 +27,15 @@ Rights Reserved.
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messenger.dtd">
                      
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+<window id="messengerWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/TR/REC-html40"
 		title="&messengerWindow.title;"
+        titlemodifier="Mozilla"
+        titlemodifierseperator=" - "
 		onload="OnLoadMessenger()"
 		onunload="OnUnloadMessenger()"
-		id="messengerWindow"
-		style="width:100%;height:100%" align="vertical"
-		width="640" height="480"
+		align="vertical"
         persist="width height x y"
 		windowtype="mail:3pane">
 
@@ -161,6 +162,8 @@ Rights Reserved.
       <menu value="&showToolbarMenu.label;">
         <menupopup>
 		<menuitem value="&showMessengerToolbarCmd.label;" oncommand="MsgShowMsgToolbar();"/>
+        <menuitem value="&showMessageCmd.label;" oncommand="MsgToggleMessagePane();"/>
+        <menuitem value="&showFoldersCmd.label;" oncommand="MsgToggleFolderPane();"/>
 		</menupopup>
       </menu>
       <menuseparator/>
@@ -200,7 +203,6 @@ Rights Reserved.
 		</menupopup>
       </menu>
       <menuseparator/>
-      <menuitem value="&showMessageCmd.label;" oncommand="MsgShowMessage();"/>
       <menuitem value="&viewAttachmentsInlineCmd.label;" oncommand="MsgViewAttachInline();"/>
       <menuitem value="&wrapLongLinesCmd.label;" oncommand="MsgWrapLongLines();"/>
       <menuseparator/>
@@ -448,7 +450,8 @@ Rights Reserved.
 		  <tree id="threadTree"/>
 		 </html:div>
 
-	    <splitter collapse="after" style="border-top:solid black 1px; border-bottom:solid black 1px;" />
+	    <splitter id="messagePaneSplitter" collapse="after" persist="state"
+                  style="border-top:solid black 1px; border-bottom:solid black 1px;" />
 			
     	<!-- message view -->
 		  <html:iframe flex="3" style="height:0px" name="messagepane" src="about:blank"/>
diff --git a/mozilla/mailnews/base/resources/content/widgetglue.js b/mozilla/mailnews/base/resources/content/widgetglue.js
index 68c986653ad..aeb689d806c 100644
--- a/mozilla/mailnews/base/resources/content/widgetglue.js
+++ b/mozilla/mailnews/base/resources/content/widgetglue.js
@@ -441,13 +441,31 @@ function MsgFilters() {
     window.openDialog("chrome://messenger/content/FilterListDialog.xul", "FilterDialog", "chrome");
 }
 
+function MsgToggleMessagePane()
+{
+    MsgToggleSplitter("messagePaneSplitter");
+}
+
+function MsgToggleSplitter(id)
+{
+    var splitter = document.getElementById("messagePaneSplitter");
+    var state = splitter.getAttribute("state");
+    if (state == "collapsed")
+        splitter.setAttribute("state", null);
+    else
+        splitter.setAttribute("state", "collapsed")
+}
+
+function MsgShowFolders()
+{
+
+
+}
 
 function MsgFolderProperties() {}
 
 function MsgShowMsgToolbar() {}
 function MsgShowLocationbar() {}
-function MsgShowMessage() {}
-function MsgShowFolders() {}
 function MsgSortByFlag() {}
 function MsgSortByPriority() {}
 function MsgSortBySize() {}
diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
index 0601a2ae2f3..9d075218a24 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -62,10 +62,10 @@ Rights Reserved.
 <!ENTITY accountWizardCmd.label "New Account Wizard...">
 
 <!-- View Menu -->
-<!ENTITY showToolbarMenu.label ".Toolbars">
+<!ENTITY showToolbarMenu.label "Show...">
 <!ENTITY showSidebarMenu.label ".SideBar">
-<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">  
-<!ENTITY showMessageCmd.label ".Message">  
+<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">
+<!ENTITY showMessageCmd.label "Message">  
 <!ENTITY showFoldersCmd.label ".Folders">  
 <!ENTITY sortMenu.label "Sort"> 
 <!ENTITY sortByDateCmd.label "by Date">  
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
index 0601a2ae2f3..9d075218a24 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -62,10 +62,10 @@ Rights Reserved.
 <!ENTITY accountWizardCmd.label "New Account Wizard...">
 
 <!-- View Menu -->
-<!ENTITY showToolbarMenu.label ".Toolbars">
+<!ENTITY showToolbarMenu.label "Show...">
 <!ENTITY showSidebarMenu.label ".SideBar">
-<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">  
-<!ENTITY showMessageCmd.label ".Message">  
+<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">
+<!ENTITY showMessageCmd.label "Message">  
 <!ENTITY showFoldersCmd.label ".Folders">  
 <!ENTITY sortMenu.label "Sort"> 
 <!ENTITY sortByDateCmd.label "by Date">