From 8ff9d05e2af727ebb03f604ed96f523eb645fdca Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Mon, 3 May 1999 23:50:58 +0000
Subject: [PATCH] fix for #5792 - fix move/copy message in message menu to use
 the new account manager datasource

---
 mailnews/ui/messenger/resources/mailshell.xul | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mailnews/ui/messenger/resources/mailshell.xul b/mailnews/ui/messenger/resources/mailshell.xul
index b8a9f8fea03..28ced2edc0d 100644
--- a/mailnews/ui/messenger/resources/mailshell.xul
+++ b/mailnews/ui/messenger/resources/mailshell.xul
@@ -55,7 +55,8 @@
 <!ENTITY searchCmd.label ".Search Messages">  
 <!ENTITY filtersCmd.label ".Message Filters...">  
 <!ENTITY folderPropsCmd.label ".Folder Properties">  
-<!ENTITY prefsCmd.label ".Preferences">  
+<!ENTITY prefsCmd.label ".Preferences">
+<!ENTITY accountManagerCmd.label "Account Manager">
 <!ENTITY viewMenu.label "View"> 
 <!ENTITY showMenu.label ".Show"> 
 <!ENTITY showMessageToolbarCmd.label ".Message Toolbar">  
@@ -271,6 +272,7 @@
       <menuitem name="&folderPropsCmd.label;" onclick="MsgFolderProperties();"/>
       <separator/>
       <menuitem name="&prefsCmd.label;" onclick="MsgPreferences();"/>
+      <menuitem name="&accountManagerCmd.label;" onclick="MsgAccountManager();"/>
     </menu>
     <menu name="&viewMenu.label;">
       <menu name="&showMenu.label;">
@@ -359,10 +361,10 @@
       </menu>
       <menuitem name="&editMsgAsNewCmd.label;" onclick="MsgEditMessageAsNew();"/>
       <separator/>
-      <menu name="&moveMsgMenu.label;" datasources="rdf:mailnewsfolders" id="mailbox:/" open="true"
+      <menu name="&moveMsgMenu.label;" datasources="rdf:mailnewsfolders rdf:msgaccountmanager" id="msgaccounts:/" open="true"
 			onclick="MsgMoveMessage(event.target)">
       </menu>
-      <menu name="&copyMsgMenu.label;" datasources="rdf:mailnewsfolders" id="mailbox:/" open="true"
+      <menu name="&copyMsgMenu.label;" datasources="rdf:mailnewsfolders rdf:msgaccountmanager" id="msgaccounts:/" open="true"
 			onclick="MsgCopyMessage(event.target)">
       </menu>
       <separator/>