diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index 0753c2fb3d3..c14c3c8033b 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -275,7 +275,10 @@
   <key id="space" key=" " oncommand="SpaceHit(event)"/>
 
   <!-- File Menu -->
-  <key id="key_close"/>
+  <key id="key_close"/>
+#ifndef XP_MACOSX
+  <key id="key_renameFolder" keycode="&renameFolder.key;" oncommand="goDoCommand('cmd_renameFolder')"/>
+#endif
   <key id="key_quit"/>
   <!-- Edit Menu -->
   <key id="key_undo"/>
@@ -1041,7 +1044,8 @@
            oncommand="MsgSubscribe();"/>
            <menuseparator/>
           <menuitem id="menu_renameFolder" label="&renameFolder.label;"
-                 accesskey="&renameFolder.accesskey;"
+                 accesskey="&renameFolder.accesskey;"
+                 key="key_renameFolder"
                  observes="cmd_renameFolder"/>
           <menuitem id="menu_compactFolder" label="&compactFolders.label;" accesskey="&compactFolder.accesskey;" observes="cmd_compactFolder"/>
           <menuitem id="menu_emptyTrash" label="&emptyTrashCmd.label;"
diff --git a/mail/base/locale/messenger.dtd b/mail/base/locale/messenger.dtd
index f4b93b24a4a..9eb74cfeacd 100644
--- a/mail/base/locale/messenger.dtd
+++ b/mail/base/locale/messenger.dtd
@@ -35,7 +35,8 @@
 <!ENTITY subscribeCmd.label "Subscribe...">
 <!ENTITY subscribeCmd.accesskey "b">
 <!ENTITY renameFolder.label "Rename Folder...">
-<!ENTITY renameFolder.accesskey "R">
+<!ENTITY renameFolder.accesskey "R">
+<!ENTITY renameFolder.key "VK_F2"> 
 <!ENTITY compactFolders.label "Compact Folders">
 <!ENTITY compactFolder.accesskey		"F">
 <!ENTITY emptyTrashCmd.label "Empty Trash">