From ce80d8481f16e193f07efd29caae764831077375 Mon Sep 17 00:00:00 2001
From: "jshin%mailaps.org" <jshin%mailaps.org>
Date: Mon, 13 Sep 2004 01:11:32 +0000
Subject: [PATCH] bug 92499 and bug 227265 : view menu is not an obvious place
 for character encoding in mail compose (r=neil, sr=bienvenu)

---
 mail/components/compose/content/compose.xul                  | 3 +--
 mailnews/compose/resources/content/messengercompose.xul      | 3 +--
 mailnews/compose/resources/locale/en-US/messengercompose.dtd | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mail/components/compose/content/compose.xul b/mail/components/compose/content/compose.xul
index 4cd48164b3d..5501f3757e3 100644
--- a/mail/components/compose/content/compose.xul
+++ b/mail/components/compose/content/compose.xul
@@ -273,8 +273,6 @@
                         type="checkbox"/>
             </menupopup>
           </menu>
-          <menuseparator/>
-          <menu id = "maileditCharsetMenu" />
         </menupopup>
       </menu>
   
@@ -314,6 +312,7 @@
               <menuitem type="radio" name="priority" label="&highestPriorityCmd.label;" accesskey="&highestPriorityCmd.accesskey;" id="priotity_highest"/>
             </menupopup>
           </menu>
+          <menu id="maileditCharsetMenu" />
           <menu id="fccMenu" label="&fileCarbonCopyCmd.label;" 
              accesskey="&fileCarbonCopyCmd.accesskey;" 
              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 46daad649d7..482d779fdc0 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -305,8 +305,6 @@
                         type="checkbox"/>
             </menupopup>
           </menu>
-          <menuseparator/>
-          <menu id = "maileditCharsetMenu" />
         </menupopup>
       </menu>
   
@@ -345,6 +343,7 @@
               <menuitem type="radio" name="priority" label="&highestPriorityCmd.label;" accesskey="&highestPriorityCmd.accesskey;" id="priotity_highest"/>
             </menupopup>
           </menu>
+          <menu id="maileditCharsetMenu" />
           <menu id="fccMenu" label="&fileCarbonCopyCmd.label;" 
              accesskey="&fileCarbonCopyCmd.accesskey;" 
              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
diff --git a/mailnews/compose/resources/locale/en-US/messengercompose.dtd b/mailnews/compose/resources/locale/en-US/messengercompose.dtd
index 73534b070ba..ff353e09282 100644
--- a/mailnews/compose/resources/locale/en-US/messengercompose.dtd
+++ b/mailnews/compose/resources/locale/en-US/messengercompose.dtd
@@ -113,7 +113,7 @@
 <!ENTITY quoteCmd.accesskey "Q">
 <!ENTITY selectAddressCmd.label "Select Addresses...">
 <!ENTITY selectAddressCmd.key "">
-<!ENTITY selectAddressCmd.accesskey "c">
+<!ENTITY selectAddressCmd.accesskey "A">
 
 <!ENTITY checkSpellingCmd.label "Check Spelling...">
 <!ENTITY checkSpellingCmd.key "K">