Bug 257001 Menu item View|Show/Hide|Folder Pane is missing

r=neil, sr=bienvenu

mailnews/base/resources/content/mailWindowOverlay.js

@@ -160,6 +160,10 @@ function view_init()
       message_menuitem.setAttribute('disabled', gAccountCentralLoaded);
   }
 
+  var folderPane_menuitem = document.getElementById('menu_showFolderPane');
+  if (folderPane_menuitem && !folderPane_menuitem.hidden)
+    folderPane_menuitem.setAttribute('checked', !IsFolderPaneCollapsed());
+
   // Disable some menus if account manager is showing
   var sort_menuitem = document.getElementById('viewSortMenu');
   if (sort_menuitem) {

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -375,7 +375,7 @@
 
   <!-- View Toggle Keys (F8/F9) -->
   <key id="key_toggleMessagePane" keycode="VK_F8" oncommand="MsgToggleMessagePane();"/>
-  <key id="key_toggleThreadPane" keycode="VK_F9" oncommand="MsgToggleSplitter('gray_vertical_splitter');"/>
+  <key id="key_toggleFolderPane" keycode="VK_F9" oncommand="MsgToggleSplitter('gray_vertical_splitter');"/>
 
   <!-- Label Keys -->
   <key id="key_label0" charcode="&labelCmd0.key;"  oncommand="goDoCommand('cmd_label0')"/>
@@ -1196,12 +1196,18 @@
            checked="true"/>
           <menuitem type="checkbox" id="menu_showTaskbar"/>
           <menuseparator id="menu_showSearch_showMessage_Separator"/>
-          <menuitem id="menu_showMessage"
+          <menuitem id="menu_showMessagePane"
            type="checkbox"
-           label="&showMessageCmd.label;"
-           accesskey="&showMessageCmd.accesskey;"
+           label="&showMessagePaneCmd.label;"
+           accesskey="&showMessagePaneCmd.accesskey;"
            key="key_toggleMessagePane"
            oncommand="MsgToggleMessagePane();"/>
+          <menuitem id="menu_showFolderPane"
+           type="checkbox"
+           label="&showFolderPaneCmd.label;"
+           accesskey="&showFolderPaneCmd.accesskey;"
+           key="key_toggleFolderPane"
+           oncommand="MsgToggleSplitter('gray_vertical_splitter');"/>
         </menupopup>
       </menu>
       <menuseparator id="viewMessagesMenuSeparator"/>

mailnews/base/resources/content/messageWindow.js

@@ -403,9 +403,13 @@ function extractMsgKeyFromURI()
 
 function HideMenus()
 {
-	var message_menuitem=document.getElementById('menu_showMessage');
-	if (message_menuitem)
-		message_menuitem.setAttribute("hidden", "true");
+    var messagePaneMenuitem = document.getElementById('menu_showMessagePane');
+    if (messagePaneMenuitem)
+        messagePaneMenuitem.hidden = true;
+
+    var folderPaneMenuitem = document.getElementById('menu_showFolderPane');
+    if (folderPaneMenuitem)
+        folderPaneMenuitem.hidden = true;
 
 	var showSearchToolbar = document.getElementById('menu_showSearchToolbar');
 	if (showSearchToolbar)

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

@@ -162,8 +162,10 @@
 
 <!ENTITY showLocationToolbarCmd.label		".Location Toolbar">
 <!ENTITY showLocationToolbarCmd.accesskey "L">
-<!ENTITY showMessageCmd.label "Message Pane">
-<!ENTITY showMessageCmd.accesskey "M">
+<!ENTITY showMessagePaneCmd.label "Message Pane">
+<!ENTITY showMessagePaneCmd.accesskey "M">
+<!ENTITY showFolderPaneCmd.label "Folder Pane">
+<!ENTITY showFolderPaneCmd.accesskey "F">
 
 <!-- sortMenu is also used by addressbook -->
 <!ENTITY sortMenu.label "Sort by">