From 327ed2ec555a15b8913baa65559814dcf84cf40e Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Fri, 19 Aug 2011 23:56:18 +0100
Subject: [PATCH] Bug 680507 - Remove duplicated keys from messengercompose
 r=neil

---
 editor/ui/composer/content/editorOverlay.xul | 1 +
 suite/mailnews/compose/messengercompose.xul  | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index 2695493a9a..3e86d302c2 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -81,6 +81,7 @@
     <key id="key_copy"/>
     <key id="key_paste"/>
     <key id="key_delete"/>
+    <key id="key_delete2"/>
     <key id="key_selectAll"/>
     <key id="pastequotationkb"
          key="&pasteAsQuotationCmd.key;"
diff --git a/suite/mailnews/compose/messengercompose.xul b/suite/mailnews/compose/messengercompose.xul
index 6418ee093e..e7ee9d02d3 100644
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -157,16 +157,12 @@
 
 <keyset id="tasksKeys">
   <!-- File Menu -->
-  <key id="key_close"/>
   <key id="key_save"  key="&saveCmd.key;" command="cmd_saveDefault" modifiers="accel"/>
   <key id="key_send" keycode="&sendCmd.keycode;" observes="cmd_sendWithCheck" modifiers="accel"/>
   <key id="key_sendLater" keycode="&sendLaterCmd.keycode;" observes="cmd_sendLater" modifiers="accel, shift"/>
-  <key id="key_print"/>
 
   <!-- Edit Menu -->
   <key id="key_rewrap" key="&editRewrapCmd.key;" command="cmd_rewrap" modifiers="accel"/>
-  <key id="key_delete2"/>
-  <keyset id="findKeys"/>
 
   <!-- Options Menu -->
   <!-- key id="key_selectAddresses" key="&selectAddressCmd.key;" command="cmd_selectAddress"/ -->