From 5c49f80d1b22922eac81a3daa7aa5861ce7e2f7f Mon Sep 17 00:00:00 2001
From: Ian Neal <iann_cvs@blueyonder.co.uk>
Date: Tue, 6 Sep 2011 00:11:08 +0100
Subject: [PATCH] Bug 680890 - Make more use of mailOverlay in mail composition
 window r=neil

---
 .../en-US/chrome/mailnews/compose/messengercompose.dtd     | 2 --
 suite/mailnews/compose/messengercompose.xul                | 7 +------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
index 6e8f6906c1..b24d0f172e 100644
--- a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -11,8 +11,6 @@
 <!-- menu items:  the . means that the menu item isn't implemented yet -->
 
 <!-- File menu items -->
-<!ENTITY newMessage.label "Message">  
-<!ENTITY newMessage.accesskey "M">  
 <!ENTITY saveCmd.label "Save">
 <!ENTITY saveCmd.accesskey "s">
 <!ENTITY saveAsCmd.label "Save As">
diff --git a/suite/mailnews/compose/messengercompose.xul b/suite/mailnews/compose/messengercompose.xul
index c7edc2e012..435e81e30e 100644
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -119,7 +119,6 @@
   <commandset id="composerListMenuItems"/>
   <commandset id="tasksCommands"/>
   <!-- File Menu -->
-  <command id="cmd_new" oncommand="goDoCommand('cmd_newMessage')"/>
   <command id="cmd_attachFile" oncommand="goDoCommand('cmd_attachFile')"/>
   <command id="cmd_attachPage" oncommand="goDoCommand('cmd_attachPage')"/>
   <command id="cmd_attachVCard" checked="false" oncommand="ToggleAttachVCard(event.target)"/>
@@ -234,11 +233,7 @@
             <menupopup id="menu_FilePopup">
               <menu id="menu_New">
                 <menupopup id="menu_NewPopup">
-                  <menuitem id="menu_NewMessage"
-                            label="&newMessage.label;"
-                            accesskey="&newMessage.accesskey;"
-                            key="key_newMessage"
-                            oncommand="goOpenNewMessage();"/>
+                  <menuitem id="menu_newMessage"/>
                   <menuseparator id="menuNewPopupSeparator"/>
                   <menuitem id="menu_newCard"/>
                   <menuitem id="menu_newNavigator"/>