diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index 1cfda5806ed1..aaa8d78654ca 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -141,6 +141,7 @@
   <key id="key_quit"/>
   <!-- Edit Menu -->
   <key id="key_delete"/>
+  <key id="key_delete2"/> <!-- secondary delete key -->
   <key id="key_undo"/>
   <key id="key_redo"/>
   <key id="key_cut"/>
diff --git a/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul b/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
index 8f8ec30e5534..788d9d268721 100644
--- a/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
+++ b/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
@@ -4,7 +4,10 @@
 <overlay id="platformMailnewsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<!-- Delete Key -->
-	<key id="cmd_shiftDelete" keycode="VK_BACK"  xulkey="false" modifiers="shift"/>
+  <!-- Delete Key -->
+  <!-- not all Mac keyboards have a VK_DELETE key, so we use VK_BACK as
+       the primary and provide VK_DELETE as a secondary key definition -->
+	<key id="key_shiftDelete"  keycode="VK_BACK"   modifiers="shift" command="cmd_shiftDelete"/>
+	<key id="key_shiftDelete2" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
 
 </overlay>	
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 273c7d46eb9a..3c7a9d33600a 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -258,6 +258,7 @@
   <command id="button_next"/>
   <command id="button_file"/>
   <command id="cmd_delete"/>
+  <command id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
   <command id="button_junk"/>
 </commandset>
 
@@ -326,8 +327,10 @@
   <key id="key_cut"/>
   <key id="key_copy"/>
   <key id="key_paste"/>
-  <key id="key_delete" oncommand="goDoCommand('cmd_delete');" shift="false"/>
-  <key id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete')"/>
+  <key id="key_delete"/>
+  <key id="key_shiftDelete"/>
+  <key id="key_delete2"/> <!-- secondary delete key -->
+  <key id="key_shiftDelete2"/>
   <key id="key_selectAll"/>
   <key id="key_selectThread" key="&selectThreadCmd.key;"             oncommand="goDoCommand('cmd_selectThread');" modifiers="accel, shift"/>
   
diff --git a/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul b/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
index 22b51ca7caa5..db044692f41d 100644
--- a/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
+++ b/mailnews/base/resources/content/unix/platformMailnewsOverlay.xul
@@ -7,7 +7,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- Delete Key -->
-    <key id="cmd_shiftDelete" keycode="VK_DELETE"  xulkey="false" modifiers="shift"/>
+    <key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
 
     <!-- Select Thread -->
     <key id="key_selectThread" modifiers="alt,shift"/>
diff --git a/mailnews/base/resources/content/win/platformMailnewsOverlay.xul b/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
index acd4ac90d93e..2cb92e98413e 100644
--- a/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
+++ b/mailnews/base/resources/content/win/platformMailnewsOverlay.xul
@@ -5,7 +5,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <!-- Delete Key -->
-    <key id="cmd_shiftDelete" keycode="VK_DELETE"  xulkey="false" modifiers="shift"/>
+    <key id="key_shiftDelete" keycode="VK_DELETE" modifiers="shift" command="cmd_shiftDelete"/>
 
     <!-- Go submenus (Next, Previous) -->
     <menuitem id="nextMsgMenuItem" key="key_nextMsg"/>
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index f138ae3a8333..ff3f6dfcabc3 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -83,13 +83,16 @@
       <command id="saveas_vf_button" oncommand="goDoCommand('saveas_vf_button')" disabled="false"/>
       <command id="file_message_button"/>
       <command id="cmd_delete"/>
+      <command id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
     </commandset>
     <command id="cmd_close" oncommand="window.close();"/>
   </commands>
 
   <keyset id="mailKeys">
-    <key id="key_delete" oncommand="goDoCommand('cmd_delete');"/>
-    <key id="cmd_shiftDelete" oncommand="goDoCommand('cmd_shiftDelete');"/>
+    <key id="key_delete"/>
+    <key id="key_shiftDelete"/>
+    <key id="key_delete2"/> <!-- secondary delete key -->
+    <key id="key_shiftDelete2"/>
     <key id="key_close"/>
   </keyset>
 
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 203e013b53f1..88f86ed9446b 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -140,7 +140,7 @@
   <command id="cmd_print" oncommand="goDoCommand('cmd_print')"/>
 
   <!-- Edit Menu -->
-  <!--command id="cmd_pasteQuote"/  DO NOT INCLUDE THOSE PBROCASTER ESLE THE EDIT MENU WILL BE BROKEN! -->
+  <!--command id="cmd_pasteQuote"/  DO NOT INCLUDE THOSE COMMANDS ELSE THE EDIT MENU WILL BE BROKEN! -->
   <!--command id="cmd_find"/-->
   <!--command id="cmd_findNext"/-->
   <command id="cmd_rewrap"  oncommand="goDoCommand('cmd_rewrap')"/>
@@ -183,6 +183,7 @@
   <key id="key_copy"/>
   <key id="key_paste"/>
   <key id="key_delete"/>
+  <key id="key_delete2"/>
   <key id="key_selectAll"/>
   <key id="key_find"  key="&findCmd.key;"  command="cmd_find" modifiers="accel"/>
   <key id="key_findNext"  key="&findAgainCmd.key;" command="cmd_findNext" modifiers="accel"/>
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 70668aea7a9b..d97d7bb4dcbe 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -85,6 +85,7 @@
     <key id="key_copy"/>
     <key id="key_paste"/>
     <key id="key_delete"/>
+    <key id="key_delete2"/>
     <key id="key_selectAll"/>
     <key id="key_switchTextDirection"/>
 
diff --git a/xpfe/browser/resources/content/viewSourceOverlay.xul b/xpfe/browser/resources/content/viewSourceOverlay.xul
index cf67e5f190d7..21c776ff4b9d 100644
--- a/xpfe/browser/resources/content/viewSourceOverlay.xul
+++ b/xpfe/browser/resources/content/viewSourceOverlay.xul
@@ -98,6 +98,7 @@
     <key id="key_copy"/>
     <key id="key_paste"/>
     <key id="key_delete"/>
+    <key id="key_delete2"/>
     <key id="key_selectAll"/>
     <key id="key_goToLine"     key="&goToLineCmd.commandkey;"  command="cmd_goToLine"  modifiers="accel"/>
     <key id="key_find"         key="&findOnCmd.commandkey;" command="Browser:Find" modifiers="accel"/>
diff --git a/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul b/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
index 3664817d2274..dded6299c96d 100644
--- a/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
+++ b/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
@@ -27,17 +27,20 @@
   </menupopup>
   <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" modifiers="accel"/>
   <command id="cmd_quit" oncommand="goQuitApplication()"/>
-  
+
   <!-- Edit Menu -->
   <menuitem id="menu_redo" label="&redoCmd.label;" key="key_redo" command="cmd_redo"/>
   <key id="key_redo"   key="&redoCmd.key;" command="cmd_redo" modifiers="shift, accel"/>
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
-  
-  <!-- Delete Key -->
-  <key id="key_delete" keycode="VK_BACK"     command="cmd_delete"/>
 
-  <!-- This adds the Print Setup item to both Browser and Composer's 
+  <!-- Delete Key -->
+  <!-- not all Mac keyboards have a VK_DELETE key, so we use VK_BACK as
+       the primary and provide VK_DELETE as a secondary key definition -->
+  <key id="key_delete"  keycode="VK_BACK"   command="cmd_delete"/>
+  <key id="key_delete2" keycode="VK_DELETE" command="cmd_delete"/>
+
+  <!-- This adds the Print Setup item to both Browser and Composer's
        Print toolbar button popup
    -->
   <menupopup id="printMenu">
diff --git a/xpfe/components/bookmarks/resources/bm-panel.js b/xpfe/components/bookmarks/resources/bm-panel.js
index ac5b0e983c14..cb130ab11ae6 100644
--- a/xpfe/components/bookmarks/resources/bm-panel.js
+++ b/xpfe/components/bookmarks/resources/bm-panel.js
@@ -42,6 +42,14 @@
 // tree widget, etc. 
 function Startup() 
 {
+  // correct keybinding command attributes which don't do our business yet
+  var key = document.getElementById("key_delete");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_bm_delete");
+  key = document.getElementById("key_delete2");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_bm_delete");
+
   var bookmarksView = document.getElementById("bookmarks-view");  
   bookmarksView.tree.view.selection.select(0);
 }
diff --git a/xpfe/components/bookmarks/resources/bm-panel.xul b/xpfe/components/bookmarks/resources/bm-panel.xul
index b6f9334be960..42cd943d72fd 100644
--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -83,7 +83,12 @@
                 oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
     </commandset>                
     <commandset id="bookmarksItems"/>
+    <command id="cmd_undo"/>
+    <command id="cmd_redo"/>
   </commands>
+
+  <keyset id="tasksKeys"/>
+  <keyset id="bookmarks-tasksKeys"/>
   
   <hbox id="panel-bar" class="toolbar">
     <toolbarbutton id="btnAddBookmark" label="&command.addBookmark.label;"
diff --git a/xpfe/components/bookmarks/resources/bookmarksManager.js b/xpfe/components/bookmarks/resources/bookmarksManager.js
index c6b90140e082..242393d6ddf9 100644
--- a/xpfe/components/bookmarks/resources/bookmarksManager.js
+++ b/xpfe/components/bookmarks/resources/bookmarksManager.js
@@ -75,6 +75,14 @@ function Startup()
 
   document.title = titleString;
 
+  // correct keybinding command attributes which don't do our business yet
+  var key = document.getElementById("key_delete");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_bm_delete");
+  key = document.getElementById("key_delete2");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_bm_delete");
+  
   document.getElementById("CommandUpdate_Bookmarks").setAttribute("commandupdater","true");
   bookmarksView.tree.focus();
 }
diff --git a/xpfe/components/bookmarks/resources/bookmarksManager.xul b/xpfe/components/bookmarks/resources/bookmarksManager.xul
index 779ece1f46b0..41297d65e320 100644
--- a/xpfe/components/bookmarks/resources/bookmarksManager.xul
+++ b/xpfe/components/bookmarks/resources/bookmarksManager.xul
@@ -102,42 +102,15 @@
     <command id="cmd_undo"/>
     <command id="cmd_redo"/>
   </commands>
-
+  
   <stringbundleset id="stringbundleset"/>
 
   <keyset id="tasksKeys">
     <!-- File Menu -->
     <key id="key_close"/>
     <key id="key_quit"/>
-    <!-- Edit Menu -->
-    <key id="key_undo"/>
-    <key id="key_redo"/>
-
-    <!-- These keybindings do not have a command specified in the overlay,
-         which is good, but we need to specify it ourselves here -->
-    <key id="key_cut" command="cmd_bm_cut"/>
-    <key id="key_copy" command="cmd_bm_copy"/>
-    <key id="key_paste" command="cmd_bm_paste"/>
-    <key id="key_selectAll" command="cmd_bm_selectAll"/>
-
-    <!-- We need to provide our own delete key binding because the key_delete
-         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
-         is NOT what we want! -->
-    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
-    <key keycode="VK_BACK" command="cmd_bm_delete"/>
-
-    <key id="bm_key_find"
-         key="&edit.find.keybinding;"
-         command="cmd_bm_find" modifiers="accel"/>
-
-    <key id="bm_key_sortFolder"
-         key="&edit.sortFolder.keybinding;"
-         command="cmd_bm_sortfolder" modifiers="accel"/>
-
-    <key id="bm_key_properties"
-         key="&edit.properties.keybinding;"
-         command="cmd_bm_properties" modifiers="accel"/>
   </keyset>
+  <keyset id="bookmarks-tasksKeys"/>
 
   <toolbox id="bookmarks-toolbox">
     <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
@@ -178,7 +151,7 @@
                     key="key_paste" command="cmd_bm_paste"/>
           <menuitem id="menu_bm_delete"
                     label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;"
-                    key="key_bm_delete" command="cmd_bm_delete"/>
+                    key="key_delete" command="cmd_bm_delete"/>
           <menuseparator/>
           <menuitem id="menu_bm_selectAll"
                     label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
diff --git a/xpfe/components/bookmarks/resources/bookmarksOverlay.xul b/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
index cfd2530b1594..94cab7164b5c 100644
--- a/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
+++ b/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
@@ -40,7 +40,12 @@
 
  ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+<!DOCTYPE overlay [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+%bmDTD;
+]>
 
 <overlay id="bookmarksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -82,4 +87,34 @@
     <commandset id="globalEditMenuItems"/>
   </commands>
 
+  <keyset id="bookmarks-tasksKeys">
+    <!-- Edit Menu -->
+    <key id="key_undo"/>
+    <key id="key_redo"/>
+
+    <!-- These keybindings do not have a command specified in the overlay,
+         which is good, but we need to specify it ourselves here -->
+    <key id="key_cut" command="cmd_bm_cut"/>
+    <key id="key_copy" command="cmd_bm_copy"/>
+    <key id="key_paste" command="cmd_bm_paste"/>
+    <key id="key_selectAll" command="cmd_bm_selectAll"/>
+
+    <!-- These keybindings do have a command specified in the overlay,
+         which we need to correct in our Startup() function -->
+    <key id="key_delete"/>
+    <key id="key_delete2"/>
+
+    <key id="bm_key_find"
+         key="&edit.find.keybinding;"
+         command="cmd_bm_find" modifiers="accel"/>
+
+    <key id="bm_key_sortFolder"
+         key="&edit.sortFolder.keybinding;"
+         command="cmd_bm_sortfolder" modifiers="accel"/>
+
+    <key id="bm_key_properties"
+         key="&edit.properties.keybinding;"
+         command="cmd_bm_properties" modifiers="accel"/>
+  </keyset>
+
 </overlay>
diff --git a/xpfe/components/download-manager/resources/downloadmanager.js b/xpfe/components/download-manager/resources/downloadmanager.js
index 5d6aadacaeed..bb60ab943406 100644
--- a/xpfe/components/download-manager/resources/downloadmanager.js
+++ b/xpfe/components/download-manager/resources/downloadmanager.js
@@ -105,7 +105,14 @@ function DLManagerStartup()
   gDownloadView.builder.rebuild();
   window.setTimeout(onRebuild, 0);
 
-  var key;
+  // correct keybinding command attributes which don't do our business yet
+  var key = document.getElementById("key_delete");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_remove");
+  key = document.getElementById("key_delete2");
+  if (key.getAttribute("command"))
+    key.setAttribute("command", "cmd_remove");
+  
   document.getElementById("btn_openfile").hidden = gCannotLaunch;
   document.getElementById("downloadPaneContext-openfile").hidden = gCannotLaunch;
 }
diff --git a/xpfe/components/download-manager/resources/downloadmanager.xul b/xpfe/components/download-manager/resources/downloadmanager.xul
index 1bf89576e101..db8b53b1c53d 100644
--- a/xpfe/components/download-manager/resources/downloadmanager.xul
+++ b/xpfe/components/download-manager/resources/downloadmanager.xul
@@ -123,7 +123,10 @@
          which is good, but we need to specify it ourselves here -->
     <key id="key_selectAll" command="cmd_selectAll"/>
 
-    <key id="key_remove" keycode="VK_DELETE" command="cmd_remove"/>
+    <!-- These keybindings do have a command specified in the overlay,
+         which we need to correct in our DLManagerStartup() function -->
+    <key id="key_delete"/>
+    <key id="key_delete2"/>
 
     <key id="key_properties" key="&cmd.properties.keybinding;"
          command="cmd_properties" modifiers="accel"/>
diff --git a/xpfe/components/history/resources/history-panel.xul b/xpfe/components/history/resources/history-panel.xul
index cb1e0c3f72e9..a7694a3931f6 100644
--- a/xpfe/components/history/resources/history-panel.xul
+++ b/xpfe/components/history/resources/history-panel.xul
@@ -57,6 +57,7 @@
   </commandset>
   <keyset id="historyKeys">
     <key id="key_delete"/>
+    <key id="key_delete2"/>
     <key id="key_copy"/>
   </keyset>
   <popupset id="historyContextMenu"/>
diff --git a/xpfe/components/history/resources/history.xul b/xpfe/components/history/resources/history.xul
index dfa0c22aac7f..1e250ef1ca3f 100644
--- a/xpfe/components/history/resources/history.xul
+++ b/xpfe/components/history/resources/history.xul
@@ -86,6 +86,7 @@
   <key id="key_cut"/>
   <key id="key_copy"/>
   <key id="key_delete"/>
+  <key id="key_delete2"/>
   <key id="key_selectAll"/>
   <key id="key_searchHistory" key="&findHisCmd.commandkey;" command="cmd_searchHistory" modifiers="accel"/>
 </keyset>