From d5133cfb2d7b0f972d5e7f2cf5ea8742abbf2250 Mon Sep 17 00:00:00 2001
From: "jshin%mailaps.org"
 <jshin%mailaps.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 24 Sep 2004 22:47:23 +0000
Subject: [PATCH] bug 227265 : move 'Character Encoding' menu to 'Options' from
 'View' in the mail composition window (r=bienvenu, sr=mscott, a=asa)

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@162774 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../compose/content/messengercompose.xul      | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul
index 62c34a5f759..a9dc9c56441 100644
--- a/mozilla/mail/components/compose/content/messengercompose.xul
+++ b/mozilla/mail/components/compose/content/messengercompose.xul
@@ -345,21 +345,6 @@
             </menupopup>
           </menu>
           <menuitem id="menu_AddressSidebar" type="checkbox" checked="false" label="&addressSidebar.label;" accesskey="&addressSidebar.accesskey;" oncommand="toggleAddressPicker();"/>
-          <menuseparator/>
-          <menu id="maileditCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot" oncommand="SetDocumentCharacterSet(event.target.getAttribute('id'));" onpopupshowing="CreateMenu('mailedit');InitCharsetMenuCheckMark();" onpopupshown="CreateMenu('more-menu');">
-            <template>
-              <rule>
-                <menupopup>
-                  <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
-                </menupopup>
-              </rule>
-            </template>
-
-            <menupopup>
-              <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'mailedit')"/>
-              <menuseparator />
-            </menupopup>
-          </menu>
         </menupopup>
       </menu>
   
@@ -398,6 +383,20 @@
               <menuitem type="radio" name="priority" label="&lowestPriorityCmd.label;" accesskey="&lowestPriorityCmd.accesskey;" value="Lowest"  id="priority_lowest"/>              
             </menupopup>
           </menu>
+          <menu id="maileditCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot" oncommand="SetDocumentCharacterSet(event.target.getAttribute('id'));" onpopupshowing="CreateMenu('mailedit');InitCharsetMenuCheckMark();" onpopupshown="CreateMenu('more-menu');">
+            <template>
+              <rule>
+                <menupopup>
+                  <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                </menupopup>
+              </rule>
+            </template>
+
+            <menupopup>
+              <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'mailedit')"/>
+              <menuseparator />
+            </menupopup>
+          </menu>
           <menu id="fccMenu" label="&fileCarbonCopyCmd.label;" 
              accesskey="&fileCarbonCopyCmd.accesskey;" 
              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"