From b37ed07c59522f8d6dcfb48902334c3fc511696d Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Tue, 23 Sep 2003 17:03:34 +0000
Subject: [PATCH] Port Bug #188934 to thunderbird (thanks to Stephen Walker for
 the port). Junk Mail Controls: J key for mark as junk, Shift-J for mark as
 not junk.

---
 mail/base/content/mailWindowOverlay.xul | 13 +++++++++++--
 mail/base/locale/messenger.dtd          |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index ac4343134613..0753c2fb3d31 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -293,6 +293,9 @@
   <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
   
   <key id="key_toggleRead" key="&markAsReadCmd.key;"                 oncommand="goDoCommand('cmd_markAsRead');"/>
+  <key id="key_markJunk" key="&markAsJunkCmd.key;"                   oncommand="goDoCommand('cmd_markAsJunk');"/>
+  <key id="key_markNotJunk" key="&markAsNotJunkCmd.key;"             oncommand="goDoCommand('cmd_markAsNotJunk');"
+       modifiers="shift"/>
   <key id="key_markAllRead" key="&markAllReadCmd.key;"               oncommand="goDoCommand('cmd_markAllRead');" modifiers="accel, shift"/>
   <key id="key_markThreadAsRead" key="&markThreadAsReadCmd.key;"     oncommand="goDoCommand('cmd_markThreadAsRead')"/>
   <key id="key_markReadByDate" key="&markReadByDateCmd.key;"         oncommand="goDoCommand('cmd_markReadByDate')"/>
@@ -590,9 +593,11 @@
                   observes="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;"
+                  key="key_markJunk"
                   accesskey="&markAsJunkCmd.accesskey;"
                   observes="cmd_markAsJunk"/>
         <menuitem label="&markAsNotJunkCmd.label;"
+                  key="key_markNotJunk"
                   accesskey="&markAsNotJunkCmd.accesskey;"
                   observes="cmd_markAsNotJunk"/>
       </menupopup>
@@ -924,9 +929,11 @@
                   observes="cmd_markAsFlagged"/>
         <menuseparator/>
         <menuitem label="&markAsJunkCmd.label;" 
+                  key="key_markJunk"
                   accesskey="&markAsJunkCmd.accesskey;" 
                   observes="cmd_markAsJunk"/>
         <menuitem label="&markAsNotJunkCmd.label;" 
+                  key="key_markNotJunk"
                   accesskey="&markAsNotJunkCmd.accesskey;" 
                   observes="cmd_markAsNotJunk"/>
       </menupopup>
@@ -1460,10 +1467,12 @@
             <menuseparator/>
             <menuitem type="checkbox" id="markFlaggedMenuItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
             <menuseparator/>
-            <menuitem label="&markAsJunkCmd.label;" 
+            <menuitem label="&markAsJunkCmd.label;" 
+                      key="key_markJunk"
                       accesskey="&markAsJunkCmd.accesskey;" 
                       observes="cmd_markAsJunk"/>
-            <menuitem label="&markAsNotJunkCmd.label;" 
+            <menuitem label="&markAsNotJunkCmd.label;"
+                      key="key_markNotJunk" 
                       accesskey="&markAsNotJunkCmd.accesskey;" 
                       observes="cmd_markAsNotJunk"/>
           </menupopup>
diff --git a/mail/base/locale/messenger.dtd b/mail/base/locale/messenger.dtd
index e733066de50c..f4b93b24a4a1 100644
--- a/mail/base/locale/messenger.dtd
+++ b/mail/base/locale/messenger.dtd
@@ -340,8 +340,10 @@
 <!ENTITY markFlaggedCmd.accesskey "F">
 <!ENTITY markAsJunkCmd.label "As Junk">
 <!ENTITY markAsJunkCmd.accesskey "J">
+<!ENTITY markAsJunkCmd.key "j">
 <!ENTITY markAsNotJunkCmd.label "As Not Junk">
 <!ENTITY markAsNotJunkCmd.accesskey "N">
+<!ENTITY markAsNotJunkCmd.key "j">
 <!ENTITY openMessageWindowCmd.label "Open Message">
 <!ENTITY openMessageWindowCmd.accesskey "O">
 <!ENTITY openMessageWindowCmd.key "o">