--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1332,16 +1332,30 @@
           </menu>
           <menuitem id="menu_goForward" label="&goForwardCmd.label;"
                     accesskey="&goForwardCmd.accesskey;" command="cmd_goForward"
                     key="key_goForward"/>
           <menuitem id="menu_goBack" label="&goBackCmd.label;"
                     accesskey="&goBackCmd.accesskey;" command="cmd_goBack"
                     key="key_goBack"/>
           <menuseparator id="goNextSeparator"/>
+          <menu id="goFolderMenu"
+                label="&folderMenu.label;"
+                accesskey="&folderMenu.accesskey;"
+                oncommand="gFolderTreeView.selectFolder(event.target._folder, true)">
+            <menupopup id="menu_GoFolderPopup"
+                       type="folder"
+                       showFileHereLabel="true"
+                       fileHereLabel="&thisFolder.label;"
+                       fileHereAccessKey="&thisFolder.accesskey;"
+                       showRecent="true"
+                       recentLabel="&contextMoveCopyMsgRecentMenu.label;"
+                       recentAccessKey="&contextMoveCopyMsgRecentMenu.accesskey;"/>
+          </menu>
+          <menuseparator id="goFolderSeparator"/>
           <menuitem id="goStartPage"
                     label="&startPageCmd.label;"
                     accesskey="&startPageCmd.accesskey;"
                     command="cmd_goStartPage"
                     key="key_goStartPage"/>
         </menupopup>
         </menu>
 

--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -308,16 +308,20 @@ you can use these alternative items. Oth
 <!ENTITY goForwardCmd.label "Forward">
 <!ENTITY goForwardCmd.accesskey "F">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "B">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY prevStarredMsgCmd.label "Starred Message">
 <!ENTITY prevStarredMsgCmd.accesskey "S">
+<!ENTITY folderMenu.label "Folder">
+<!ENTITY folderMenu.accesskey "O">
+<!ENTITY thisFolder.label "This Folder">
+<!ENTITY thisFolder.accesskey "F">
 <!ENTITY startPageCmd.label "Mail Start Page">
 <!ENTITY startPageCmd.accesskey "S">
 
 <!-- Message Menu -->
 <!ENTITY msgMenu.label "Message">
 <!ENTITY msgMenu.accesskey "M">
 <!ENTITY newMsgCmd.label "New Message">
 <!ENTITY newMsgCmd.accesskey "N">