diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 643c4fc6a906..12d8688d9468 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -70,6 +70,11 @@
       <menuitem id="viewSourceMenuitem"/>
       <menuseparator />
       <menu id="charsetMenu"/>
+      <menu id="charsetMenu1"/>
+      <menu id="charsetMenu2"/>
+      <menu id="charsetMenu3"/>
+      <menu id="charsetMenu4"/>
+      <menu id="charsetMenu5"/>
     </menupopup>
     </menu>
  
diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index ac053a148e6f..4828903f43c7 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -82,6 +82,11 @@
       <menuitem id="viewSourceMenuitem"/ -->
       <menuseparator />
       <menu id="charsetMenu"/>
+      <menu id="charsetMenu1"/>
+      <menu id="charsetMenu2"/>
+      <menu id="charsetMenu3"/>
+      <menu id="charsetMenu4"/>
+      <menu id="charsetMenu5"/>
     </menupopup>
     </menu>
  
diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index ffbb9a4da3d0..d86e1a62fa19 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -227,155 +227,86 @@
       <menuitem id="formatToolbarMenuitem" accesskey="&viewformattingtb.accesskey;"  observes="Editor:ToggleFormattingToolbar"/>
       <menuitem id="viewSourceMenuitem" value="&viewPageSource.label;" accesskey="&viewpagesource.accesskey;" oncommand="EditorViewSource();" />
 
-    <menu id="charsetMenu" value="&dcharMenu.label;" accesskey="&viewcharsetmenu.accesskey;">
-      <menupopup>
-       <menuitem value="&dcharIso1Cmd.label;" 
-           accesskey="&charsetLatin1.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-1');"/>
-       <menuitem value="&dcharIso2Cmd.label;"
-           accesskey="&charsetLatin2.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-2');"/>
-       <menuitem value="&dcharIso3Cmd.label;"
-           accesskey="&charsetLatin3.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-3');"/>
-       <menuitem value="&dcharIso4Cmd.label;"
-           accesskey="&charsetLatin4.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-4');"/>
-       <menuitem value="&dcharIso9Cmd.label;"
-           accesskey="&charsetLatin5.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-9');"/>
-       <menuitem value="&dcharIso10Cmd.label;"
-           accesskey="&charsetLatin6.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-10');"/>
-       <menuitem value="&dcharIso13Cmd.label;"
-           accesskey="&charsetLatin7.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-13');"/>
-       <menuitem value="&dcharIso14Cmd.label;"
-           accesskey="&charsetLatin8.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-14');"/>
-       <menuitem value="&dcharIso15Cmd.label;"
-           accesskey="&charsetLatin9.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-15');"/>
-       <menuitem value="&dcharWinLat2Cmd.label;"
-           accesskey="&charsetWinLatin2.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1250');"/>
-       <menuitem value="&dcharWinLat1Cmd.label;"
-           accesskey="&charsetWinLatin1.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1252');"/>
-       <menuitem value="&dcharWinLat5Cmd.label;"
-           accesskey="&charsetWinLatin5.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1254');"/>
-       <menuitem value="&dcharWinBalRimCmd.label;"
-           accesskey="&charsetWinBaltic.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1257');"/>
-       <menuitem value="&dcharMacRomCmd.label;"
-           accesskey="&charsetMacRoman.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-roman');"/>
-       <menuitem value="&dcharMacCenEuroCmd.label;"
-           accesskey="&charsetMacCentralEurope.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-ce');"/>
-       <menuitem value="&dcharMacTurCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-turkish');"/>
-       <menuitem value="&dcharMacCroaCmd.label;"
-           accesskey="&charsetMacCroatian.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-croatian');"/>
-       <menuitem value="&dcharMacRomanianCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-romanian');"/>
-       <menuitem value="&dcharMacIceCmd.label;"
-           accesskey="&charsetMacIcelandic.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-icelandic');"/>
-         <menuseparator />
-       <menuitem value="&dcharJapanCmd.label;"
-           accesskey="&charsetJIS.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-2022-JP');"/>
-       <menuitem value="&dcharJapanShiftjsCmd.label;"
-           accesskey="&charsetshiftJIS.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('Shift_JIS');"/>
-       <menuitem value="&dcharJapanEucCmd.label;"
-           accesskey="&charsetJapaneseEUC.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('EUC-JP');"/>
-         <menuseparator />
-       <menuitem value="&dcharTradChiBigCmd.label;"
-           accesskey="&charsetChineseBig5.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('Big5');"/>
-       <menuitem value="&dcharTriChiEucCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-euc-tw');"/>
-       <menuitem value="&dcharSimpChiGbCmd.label;"
-           accesskey="&charsetChineseSimplified.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('GB2312');"/>
-         <menuseparator />
-       <menuitem value="&dcharKoreanCmd.label;"
-           accesskey="&charsetKorean.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('EUC-KR');"/>
-         <menuseparator />
-       <menuitem value="&dcharUtf7Cmd.label;"
-           accesskey="&charsetUTF7.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('UTF-7');"/>
-       <menuitem value="&dcharUtf8Cmd.label;"
-           accesskey="&charsetUTF8.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('UTF-8');"/>
-         <menuseparator />
-       <menuitem value="&dcharIsoCyrCmd.label;"
-           accesskey="&charsetISOCyrillic.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-5');"/>
-       <menuitem value="&dcharEcmaCyrCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-IR-111');"/>
-       <menuitem value="&dcharWinCyrCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1251');"/>
-       <menuitem value="&dcharDosCyrCmd.label;"
-           accesskey="&charsetDOSCyrillic.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('IBM866');"/>
-       <menuitem value="&dcharMacCyrCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-cyrillic');"/>
-       <menuitem value="&dcharMacUkrCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-ukrainian');"/>
-       <menuitem value="&dcharRusCmd.label;"
-           accesskey="&charsetRussian.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('KOI8-R');"/>
-       <menuitem value="&dcharUkrCmd.label;"
-           accesskey="&charsetUkrainian.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('KOI8-U');"/>
-         <menuseparator />
-       <menuitem value="&dcharIsoGreekCmd.label;"
-           accesskey="&charsetGreek.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-7');"/>
-       <menuitem value="&dcharWinGreekCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1253');"/>
-       <menuitem value="&dcharMacGreekCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-mac-greek');"/>
-         <menuseparator />
-       <menuitem value="&dcharWinVietCmd.label;"
-           accesskey="&charsetWinVietnamese.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1258');"/>
-       <menuitem value="&dcharVietTcnCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-viet-tcvn5712');"/>
-       <menuitem value="&dcharVietViCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('VISCII');"/>
-       <menuitem value="&dcharVieVpCmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('x-viet-vps');"/>
-         <menuseparator />
-       <menuitem value="&dcharThaiCmd.label;"
-           accesskey="&charsetThai.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('TIS-620');"/>
-         <menuseparator />
-       <menuitem value="&dcharArmCmd.label;"
-           accesskey="&charsetArmenian.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ARMSCII-8');"/>
-         <menuseparator />
-       <menuitem value="&dcharIso6Cmd.label;"
-           accesskey="&charsetArabic.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-6');"/>
-       <menuitem value="&dcharCp1256Cmd.label;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1256');"/>
-         <menuseparator />
-       <menuitem value="&dcharIso8Cmd.label;"
-           accesskey="&charsetHebrew.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('ISO-8859-8');"/>
-       <menuitem value="&dcharCp1255Cmd.label;"
-           accesskey="&charsetWinHebrew.accesskey;"
-           oncommand="EditorSetDocumentCharacterSet('windows-1255');"/>
-       </menupopup>
-     </menu>
+                <menu  id="charsetMenu" value="&dcharMenu.label;" accesskey="&viewcharsetmenu.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharIso1Cmd.label;" accesskey="&charsetLatin1.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-1');"/>
+                                 <menuitem value="&dcharIso15Cmd.label;" accesskey="&charsetLatin9.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-15');"/>
+                                 <menuitem value="&dcharIso2Cmd.label;" accesskey="&charsetLatin2.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-2');"/>
+                                 <menuitem value="&dcharIso3Cmd.label;" accesskey="&charsetLatin3.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-3');"/>
+                                 <menuitem value="&dcharIso4Cmd.label;" accesskey="&charsetLatin4.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-4');"/>
+                                 <menuitem value="&dcharIsoGreekCmd.label;" accesskey="&charsetGreek.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-7');"/>
+                                 <menuitem value="&dcharIso9Cmd.label;" accesskey="&charsetLatin5.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-9');"/>
+                                 <menuitem value="&dcharIso10Cmd.label;" accesskey="&charsetLatin6.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-10');"/>
+                                 <menuitem value="&dcharIso13Cmd.label;" accesskey="&charsetLatin7.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-13');"/>
+                                 <menuitem value="&dcharIso14Cmd.label;" accesskey="&charsetLatin8.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-14');"/>
+                        </menupopup>
+                 </menu>
+                 <menu  id="charsetMenu1" value="&dcharMenu1.label;" accesskey="&viewcharsetmenu1.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharJapanCmd.label;" accesskey="&charsetJIS.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-2022-JP');"/>
+                                 <menuitem value="&dcharJapanShiftjsCmd.label;" accesskey="&charsetshiftJIS.accesskey;" oncommand="EditorSetDocumentCharacterSet('Shift_JIS');"/>
+                                 <menuitem value="&dcharJapanEucCmd.label;" accesskey="&charsetJapaneseEUC.accesskey;" oncommand="EditorSetDocumentCharacterSet('EUC-JP');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharTradChiBigCmd.label;" accesskey="&charsetChineseBig5.accesskey;" oncommand="EditorSetDocumentCharacterSet('Big5');"/>
+                                 <menuitem value="&dcharTriChiEucCmd.label;" accesskey="&charsetChineseEUC.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-euc-tw');"/>
+                                 <menuitem value="&dcharSimpChiGbCmd.label;" accesskey="&charsetChineseSimplified.accesskey;" oncommand="EditorSetDocumentCharacterSet('GB2312');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharKoreanCmd.label;" accesskey="&charsetKorean.accesskey;" oncommand="EditorSetDocumentCharacterSet('EUC-KR');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharUtf7Cmd.label;" accesskey="&charsetUTF7.accesskey;" oncommand="EditorSetDocumentCharacterSet('UTF-7');"/>
+                                 <menuitem value="&dcharUtf8Cmd.label;" accesskey="&charsetUTF8.accesskey;" oncommand="EditorSetDocumentCharacterSet('UTF-8');"/>
+                        </menupopup>
+                 </menu>
+                 <menu  id="charsetMenu2" value="&dcharMenu2.label;" accesskey="&viewcharsetmenu2.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharRusCmd.label;" accesskey="&charsetRussian.accesskey;" oncommand="EditorSetDocumentCharacterSet('KOI8-R');"/>
+                                 <menuitem value="&dcharIsoCyrCmd.label;" accesskey="&charsetISOCyrillic.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-5');"/>
+                                 <menuitem value="&dcharWinCyrCmd.label;" accesskey="&charsetWinCyrillic.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1251');"/>
+                                 <menuitem value="&dcharEcmaCyrCmd.label;" accesskey="&charsetECMACyrillic.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-IR-111');"/>
+                                 <menuitem value="&dcharDosCyrCmd.label;" accesskey="&charsetDOSCyrillic.accesskey;" oncommand="EditorSetDocumentCharacterSet('IBM866');"/>
+                                 <menuitem value="&dcharMacCyrCmd.label;" accesskey="&charsetMacCyrillic.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-cyrillic');"/>
+                                 <menuitem value="&dcharUkrCmd.label;" accesskey="&charsetUkrainian.accesskey;" oncommand="EditorSetDocumentCharacterSet('KOI8-U');"/>
+                                 <menuitem value="&dcharMacUkrCmd.label;" accesskey="&charsetMacUkrainian.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-ukrainian');"/>
+                        </menupopup>
+                 </menu>
+                 <menu  id="charsetMenu3" value="&dcharMenu3.label;" accesskey="&viewcharsetmenu3.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinVietCmd.label;" accesskey="&charsetWinVietnamese.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1258');"/>
+                                 <menuitem value="&dcharVietTcnCmd.label;" accesskey="&charsetVietnameseTCN.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-viet-tcvn5712');"/>
+                                 <menuitem value="&dcharVietViCmd.label;" accesskey="&charsetVietnameseVIS.accesskey;" oncommand="EditorSetDocumentCharacterSet('VISCII');"/>
+                                 <menuitem value="&dcharVieVpCmd.label;" accesskey="&charsetVietnameseVPS.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-viet-vps');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharThaiCmd.label;" accesskey="&charsetThai.accesskey;" oncommand="EditorSetDocumentCharacterSet('TIS-620');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharArmCmd.label;" accesskey="&charsetArmenian.accesskey;" oncommand="EditorSetDocumentCharacterSet('ARMSCII-8');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso6Cmd.label;" accesskey="&charsetArabic.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-6');"/>
+                                 <menuitem value="&dcharCp1256Cmd.label;" accesskey="&charsetWinArabic.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1256');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso8Cmd.label;" accesskey="&charsetHebrew.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-8');"/>
+                                 <menuitem value="&dcharCp1255Cmd.label;" accesskey="&charsetWinHebrew.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1255');"/>
+                        </menupopup>
+                 </menu>
+                 <menu id="charsetMenu4" value="&dcharMenu4.label;" accesskey="&viewcharsetmenu4.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharMacRomCmd.label;" accesskey="&charsetMacRoman.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-roman');"/>
+                                 <menuitem value="&dcharMacCenEuroCmd.label;" accesskey="&charsetMacCentralEurope.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-ce');"/>
+                                 <menuitem value="&dcharMacTurCmd.label;" accesskey="&charsetMacTurkish.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-turkish');"/>
+                                 <menuitem value="&dcharMacCroaCmd.label;" accesskey="&charsetMacCroatian.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-croatian');"/>
+                                 <menuitem value="&dcharMacRomanianCmd.label;" accesskey="&charsetMacRomanian.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-romanian');"/>
+                                 <menuitem value="&dcharMacIceCmd.label;" accesskey="&charsetMacIcelandic.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-icelandic');"/>
+                                 <menuitem value="&dcharMacGreekCmd.label;" accesskey="&charsetMacGreek.accesskey;" oncommand="EditorSetDocumentCharacterSet('x-mac-greek');"/>
+                        </menupopup>
+                 </menu>
+                 <menu id="charsetMenu5" value="&dcharMenu5.label;" accesskey="&viewcharsetmenu4.accesskey;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinLat1Cmd.label;" accesskey="&charsetWinLatin1.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1252');"/>
+                                 <menuitem value="&dcharWinLat2Cmd.label;" accesskey="&charsetWinLatin2.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1250');"/>
+                                 <menuitem value="&dcharWinLat5Cmd.label;" accesskey="&charsetWinLatin5.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1254');"/>
+                                 <menuitem value="&dcharWinBalRimCmd.label;" accesskey="&charsetWinBaltic.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1257');"/>
+                                 <menuitem value="&dcharWinGreekCmd.label;" accesskey="&charsetWinGreek.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1253');"/>
+                        </menupopup>
+                 </menu>
 
     <!-- Insert menu -->
     <menu id="insertMenu" value="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
diff --git a/editor/ui/composer/locale/en-US/editorOverlay.dtd b/editor/ui/composer/locale/en-US/editorOverlay.dtd
index 16fe4cdd6c05..7add3f1985bf 100644
--- a/editor/ui/composer/locale/en-US/editorOverlay.dtd
+++ b/editor/ui/composer/locale/en-US/editorOverlay.dtd
@@ -84,87 +84,97 @@
 <!ENTITY viewpagesource.accesskey "s">
 
 <!-- Charset menu items -->
-<!ENTITY dcharMenu.label "Character Set">
+<!ENTITY dcharMenu.label "Character Set  ISO">
 <!ENTITY viewcharsetmenu.accesskey "s">
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
+<!ENTITY dcharMenu1.label "Character Set  Multibyte">
+<!ENTITY viewcharsetmenu1.accesskey "xxx">
+<!ENTITY dcharMenu2.label "Character Set  Cyrillic">
+<!ENTITY viewcharsetmenu2.accesskey "xxx">
+<!ENTITY dcharMenu3.label "Character Set  SE Asian/Armenian/Semitic">
+<!ENTITY viewcharsetmenu3.accesskey "xxx">
+<!ENTITY dcharMenu4.label "Character Set  Macintosh">
+<!ENTITY viewcharsetmenu4.accesskey "xxx">
+<!ENTITY dcharMenu5.label "Character Set  Windows">
+<!ENTITY viewcharsetmenu5.accesskey "xxx">
+<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
 <!ENTITY charsetLatin1.accesskey "l">
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
+<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
 <!ENTITY charsetLatin2.accesskey "2">
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
 <!ENTITY charsetLatin3.accesskey "3">
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
+<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
 <!ENTITY charsetLatin4.accesskey "4">
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
+<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
 <!ENTITY charsetLatin5.accesskey "9">
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
 <!ENTITY charsetLatin6.accesskey "1">
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
+<!ENTITY dcharIso13Cmd.label "Greek (ISO-8859-13)">
 <!ENTITY charsetLatin7.accesskey "n">
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
+<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
 <!ENTITY charsetLatin8.accesskey "f">
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
 <!ENTITY charsetLatin9.accesskey "9">
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
+<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)"> 
 <!ENTITY charsetWinLatin2.accesskey "0">
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
+<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
 <!ENTITY charsetWinLatin1.accesskey "d">
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
+<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
 <!ENTITY charsetWinLatin5.accesskey "o">
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
+<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
 <!ENTITY charsetWinBaltic.accesskey "b">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
+<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
 <!ENTITY charsetMacRoman.accesskey "m">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
+<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
 <!ENTITY charsetMacCentralEurope.accesskey "e">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
+<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
 <!ENTITY charsetMacTurkish.accesskey "xxx">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
+<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
 <!ENTITY charsetMacCroatian.accesskey "c">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
+<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
 <!ENTITY charsetMacRomanian.accesskey "xxx">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
+<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
 <!ENTITY charsetMacIcelandic.accesskey "i">
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
+<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
 <!ENTITY charsetJIS.accesskey "j">
 <!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
 <!ENTITY charsetshiftJIS.accesskey "s">
 <!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
 <!ENTITY charsetJapaneseEUC.accesskey "p">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
 <!ENTITY charsetChineseBig5.accesskey "5">
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
+<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
 <!ENTITY charsetChineseEUC.accesskey "xxx">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY charsetChineseSimplified.accesskey "f">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
 <!ENTITY charsetKorean.accesskey "k">
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
+<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
 <!ENTITY charsetUTF7.accesskey "7">
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
 <!ENTITY charsetUTF8.accesskey "8">
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
+<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
 <!ENTITY charsetISOCyrillic.accesskey "y">
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
+<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
 <!ENTITY charsetECMACyrillic.accesskey "xxx">
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
+<!ENTITY dcharDosCyrCmd.label "Cyrillic (IBM866)">
 <!ENTITY charsetDOSCyrillic.accesskey "d">
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
+<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
 <!ENTITY charsetWinCyrillic.accesskey "xxx">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
+<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
 <!ENTITY charsetMacCyrillic.accesskey "xxx">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
+<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
 <!ENTITY charsetMacUkrainian.accesskey "xxx">
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
+<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
 <!ENTITY charsetRussian.accesskey "r">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
 <!ENTITY charsetUkrainian.accesskey "u">
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
+<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
 <!ENTITY charsetGreek.accesskey "g">
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
+<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
 <!ENTITY charsetWinGreek.accesskey "xxx">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
+<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
 <!ENTITY charsetMacGreek.accesskey "xxx">
-<!ENTITY dcharWinVietCmd.label "Windows Vietnamese (windows-1258)">
+<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
 <!ENTITY charsetWinVietnamese.accesskey "v">
 <!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
 <!ENTITY charsetVietnameseTCN.accesskey "xxx">
@@ -176,13 +186,13 @@
 <!ENTITY charsetThai.accesskey "t">
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
 <!ENTITY charsetArmenian.accesskey "a">
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
+<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
 <!ENTITY charsetArabic.accesskey "6">
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
+<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
 <!ENTITY charsetHebrew.accesskey "h">
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
+<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
 <!ENTITY charsetWinHebrew.accesskey "w">
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
+<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
 <!ENTITY charsetWinArabic.accesskey "xxx">
 
 <!-- Insert menu items -->
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index b57b23938d85..a7ad90cd2299 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -252,71 +252,87 @@ Rights Reserved.
       <menuitem value="&pageSourceCmd.label;" oncommand="MsgViewPageSource();"/>
       <menuitem value="&pageInfoCmd.label;" oncommand="MsgViewPageInfo();"/>
       <menuseparator/>
-      <menu value="&dcharMenu.label;">
-	         <menupopup>
-			 <menuitem value="&dcharIso1Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-1');"/>
-	         <menuitem value="&dcharIso2Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-2');"/>
-	         <menuitem value="&dcharIso3Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-3');"/>
-	         <menuitem value="&dcharIso4Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-4');"/>
-	         <menuitem value="&dcharIso9Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-9');"/>
-	         <menuitem value="&dcharIso10Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-10');"/>
-	         <menuitem value="&dcharIso13Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-13');"/>
-	         <menuitem value="&dcharIso14Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-14');"/>
-	         <menuitem value="&dcharIso15Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-15');"/>
-	         <menuitem value="&dcharWinLat2Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1250');"/>
-	         <menuitem value="&dcharWinLat1Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1252');"/>
-	         <menuitem value="&dcharWinLat5Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1254');"/>
-	         <menuitem value="&dcharWinBalRimCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1257');"/>
-	         <menuitem value="&dcharMacRomCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-roman');"/>
-	         <menuitem value="&dcharMacCenEuroCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-ce');"/>
-	         <menuitem value="&dcharMacTurCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-turkish');"/>
-	         <menuitem value="&dcharMacCroaCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-croatian');"/>
-	         <menuitem value="&dcharMacRomanianCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-romanian');"/>
-	         <menuitem value="&dcharMacIceCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-icelandic');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharJapanCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-2022-JP');"/>
-	         <menuitem value="&dcharJapanShiftjsCmd.label;" oncommand="MessengerSetDefaultCharacterSet('Shift_JIS');"/>
-	         <menuitem value="&dcharJapanEucCmd.label;" oncommand="MessengerSetDefaultCharacterSet('EUC-JP');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharTradChiBigCmd.label;" oncommand="MessengerSetDefaultCharacterSet('Big5');"/>
-	         <menuitem value="&dcharTriChiEucCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-euc-tw');"/>
-	         <menuitem value="&dcharSimpChiGbCmd.label;" oncommand="MessengerSetDefaultCharacterSet('GB2312');"/>
-                 <menuseparator />
- 	         <menuitem value="&dcharKoreanCmd.label;" oncommand="MessengerSetDefaultCharacterSet('EUC-KR');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharUtf7Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('UTF-7');"/>
-	         <menuitem value="&dcharUtf8Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('UTF-8');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharIsoCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-5');"/>
-	         <menuitem value="&dcharEcmaCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-IR-111');"/>
-	         <menuitem value="&dcharWinCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1251');"/>
-	         <menuitem value="&dcharDosCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('IBM866');"/>
-	         <menuitem value="&dcharMacCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-cyrillic');"/>
-	         <menuitem value="&dcharMacUkrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-ukrainian');"/>
-	         <menuitem value="&dcharRusCmd.label; " oncommand="MessengerSetDefaultCharacterSet('KOI8-R');"/>
-	         <menuitem value="&dcharUkrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('KOI8-U');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharIsoGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-7');"/>
-	         <menuitem value="&dcharWinGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1253');"/>
-	         <menuitem value="&dcharMacGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-greek');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharWinVietCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1258');"/>
-	         <menuitem value="&dcharVietTcnCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-viet-tcvn5712');"/>
-	         <menuitem value="&dcharVietViCmd.label;" oncommand="MessengerSetDefaultCharacterSet('VISCII');"/>
-	         <menuitem value="&dcharVieVpCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-viet-vps');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharThaiCmd.label;" oncommand="MessengerSetDefaultCharacterSet('TIS-620');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharArmCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ARMSCII-8');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharIso6Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-6');"/>
-	         <menuitem value="&dcharCp1256Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1256');"/>
-                 <menuseparator />
-	         <menuitem value="&dcharIso8Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-8');"/>
-	         <menuitem value="&dcharCp1255Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1255');"/>
-	         </menupopup>
-	   </menu>
-	   </menupopup>
+                <menu value="&dcharMenu.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharIso1Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-1');"/>
+                                 <menuitem value="&dcharIso15Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-15');"/>
+                                 <menuitem value="&dcharIso2Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-2');"/>
+                                 <menuitem value="&dcharIso3Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-3');"/>
+                                 <menuitem value="&dcharIso4Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-4');"/>
+                                 <menuitem value="&dcharIsoGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-7');"/>
+                                 <menuitem value="&dcharIso9Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-9');"/>
+                                 <menuitem value="&dcharIso10Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-10');"/>
+                                 <menuitem value="&dcharIso13Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-13');"/>
+                                 <menuitem value="&dcharIso14Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-14');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu1.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharJapanCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-2022-JP');"/>
+                                 <menuitem value="&dcharJapanShiftjsCmd.label;" oncommand="MessengerSetDefaultCharacterSet('Shift_JIS');"/>
+                                 <menuitem value="&dcharJapanEucCmd.label;" oncommand="MessengerSetDefaultCharacterSet('EUC-JP');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharTradChiBigCmd.label;" oncommand="MessengerSetDefaultCharacterSet('Big5');"/>
+                                 <menuitem value="&dcharTriChiEucCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-euc-tw');"/>
+                                 <menuitem value="&dcharSimpChiGbCmd.label;" oncommand="MessengerSetDefaultCharacterSet('GB2312');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharKoreanCmd.label;" oncommand="MessengerSetDefaultCharacterSet('EUC-KR');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharUtf7Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('UTF-7');"/>
+                                 <menuitem value="&dcharUtf8Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('UTF-8');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu2.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharRusCmd.label; " oncommand="MessengerSetDefaultCharacterSet('KOI8-R');"/>
+                                 <menuitem value="&dcharIsoCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-5');"/>
+                                 <menuitem value="&dcharWinCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1251');"/>
+                                 <menuitem value="&dcharEcmaCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-IR-111');"/>
+                                 <menuitem value="&dcharDosCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('IBM866');"/>
+                                 <menuitem value="&dcharMacCyrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-cyrillic');"/>
+                                 <menuitem value="&dcharUkrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('KOI8-U');"/>
+                                 <menuitem value="&dcharMacUkrCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-ukrainian');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu3.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinVietCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1258');"/>
+                                 <menuitem value="&dcharVietTcnCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-viet-tcvn5712');"/>
+                                 <menuitem value="&dcharVietViCmd.label;" oncommand="MessengerSetDefaultCharacterSet('VISCII');"/>
+                                 <menuitem value="&dcharVieVpCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-viet-vps');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharThaiCmd.label;" oncommand="MessengerSetDefaultCharacterSet('TIS-620');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharArmCmd.label;" oncommand="MessengerSetDefaultCharacterSet('ARMSCII-8');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso6Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-6');"/>
+                                 <menuitem value="&dcharCp1256Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1256');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso8Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('ISO-8859-8');"/>
+                                 <menuitem value="&dcharCp1255Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1255');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu4.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharMacRomCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-roman');"/>
+                                 <menuitem value="&dcharMacCenEuroCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-ce');"/>
+                                 <menuitem value="&dcharMacTurCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-turkish');"/>
+                                 <menuitem value="&dcharMacCroaCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-croatian');"/>
+                                 <menuitem value="&dcharMacRomanianCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-romanian');"/>
+                                 <menuitem value="&dcharMacIceCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-icelandic');"/>
+                                 <menuitem value="&dcharMacGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('x-mac-greek');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu5.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinLat1Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1252');"/>
+                                 <menuitem value="&dcharWinLat2Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1250');"/>
+                                 <menuitem value="&dcharWinLat5Cmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1254');"/>
+                                 <menuitem value="&dcharWinBalRimCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1257');"/>
+                                 <menuitem value="&dcharWinGreekCmd.label;" oncommand="MessengerSetDefaultCharacterSet('windows-1253');"/>
+                        </menupopup>
+                 </menu>
+          </menupopup>
     </menu>
     <menu value="&searchMenu.label;">
         <menupopup>
diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd
index b5afac18f1a5..5293718cb43a 100644
--- a/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -111,96 +111,61 @@ Rights Reserved.
 <!ENTITY pageInfoCmd.label ".Page Info">  
 <!ENTITY charSetMenu.label "Character Set"> 
 <!ENTITY translateMenu.label ".Translate"> 
-<!ENTITY dcharMenu.label "Character Set">
-<!-- LOCALIZATION NOTE (dcharIso1Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!-- LOCALIZATION NOTE (dcharIso2Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!-- LOCALIZATION NOTE (dcharIso3Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!-- LOCALIZATION NOTE (dcharIso4Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!-- LOCALIZATION NOTE (dcharIso9Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!-- LOCALIZATION NOTE (dcharIso10Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!-- LOCALIZATION NOTE (dcharIso13Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!-- LOCALIZATION NOTE (dcharIso14Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!-- LOCALIZATION NOTE (dcharIso15Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!-- LOCALIZATION NOTE (dcharWinLat2Cmd.label) : Do not translate "windows-1250" in below line. -->
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!-- LOCALIZATION NOTE (dcharWinLat1Cmd.label) : Do not translate "windows-1252" in below line. -->
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!-- LOCALIZATION NOTE (dcharWinLat5Cmd.label) : Do not translate "windows-1254" in below line. -->
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!-- LOCALIZATION NOTE (dcharWinBalRimCmd.label) : Do not translate "windows-1257" in below line. -->
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!-- LOCALIZATION NOTE (dcharJapanCmd.label) : Do not translate "ISO", "JIS" and "JP" in below line. -->
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
-<!-- LOCALIZATION NOTE (dcharJapanShiftjsCmd.label) : Do not translate "Shift_JIS" in below line. -->
+<!ENTITY dcharMenu.label "Character Set  ISO">
+<!ENTITY dcharMenu1.label "Character Set  Multibyte">
+<!ENTITY dcharMenu2.label "Character Set  Cyrillic">
+<!ENTITY dcharMenu3.label "Character Set  SE Asian/Armenian/Semitic">
+<!ENTITY dcharMenu4.label "Character Set  Macintosh">
+<!ENTITY dcharMenu5.label "Character Set  Windows">
+<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
+<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
+<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
+<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
+<!ENTITY dcharIso13Cmd.label "Greek (ISO-8859-13)">
+<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
+<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)"> 
+<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
+<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
+<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
+<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
+<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
+<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
+<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
+<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
+<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
+<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
 <!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
-<!-- LOCALIZATION NOTE (dcharJapanEucCmd.label) : Do not translate "EUC-JP" in below line. -->
 <!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!-- LOCALIZATION NOTE (dcharTradChiBigCmd.label) : Do not translate "Big5" in below line. -->
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!-- LOCALIZATION NOTE (dcharTriChiEucCmd.label) : Do not translate "EUC-TW" in below line. -->
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!-- LOCALIZATION NOTE (dcharSimpChiGbCmd.label) : Do not translate "GB2312" in below line. -->
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
-<!-- LOCALIZATION NOTE (dcharKoreanCmd.label) : Do not translate "EUC-KR" in below line. -->
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!-- LOCALIZATION NOTE (dcharUtf7Cmd.label) : Do not translate "UTF-7" in below line. -->
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!-- LOCALIZATION NOTE (dcharUtf8Cmd.label) : Do not translate "UTF-8" in below line. -->
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!-- LOCALIZATION NOTE (dcharIsoCyrCmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!-- LOCALIZATION NOTE (dcharEcmaCyrCmd.label) : Do not translate "ECMA", "ISO" and "IR" in below line. -->
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!-- LOCALIZATION NOTE (dcharDosCyrCmd.label) : Do not translate "DOS" and "IBM" in below line. -->
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!-- LOCALIZATION NOTE (dcharWinCyrCmd.label) : Do not translate "windows-1251" in below line. -->
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!-- LOCALIZATION NOTE (dcharRusCmd.label) : Do not translate "KOI8-R" in below line. -->
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!-- LOCALIZATION NOTE (dcharUkrCmd.label) : Do not translate "KOI8-U" in below line. -->
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!-- LOCALIZATION NOTE (dcharIsoGreekCmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!-- LOCALIZATION NOTE (dcharWinGreekCmd.label) : Do not translate "windows-1253" in below line. -->
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!-- LOCALIZATION NOTE (dcharWinVietCmd.label) : Do not translate "windows-1258" in below line. -->
-<!ENTITY dcharWinVietCmd.label "Windows Vietnamese (windows-1258)">
-<!-- LOCALIZATION NOTE (dcharVietTcnCmd.label) : Do not translate "TCVN5712" in below line. -->
+<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
+<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
+<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
+<!ENTITY dcharDosCyrCmd.label "Cyrillic (IBM866)">
+<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
+<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
+<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
+<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
+<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
+<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
+<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
+<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
 <!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
-<!-- LOCALIZATION NOTE (dcharVietViCmd.label) : Do not translate "VISCII" in below line. -->
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
-<!-- LOCALIZATION NOTE (dcharVieVpCmd.label) : Do not translate "VPS" in below line. -->
 <!ENTITY dcharVieVpCmd.label "Vietnamese (VPS)">
-<!-- LOCALIZATION NOTE (dcharThaiCmd.label) : Do not translate "TIS-620" in below line. -->
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
-<!-- LOCALIZATION NOTE (dcharArmCmd.label) : Do not translate "ARMSCII-8" in below line. -->
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!-- LOCALIZATION NOTE (dcharIso6Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!-- LOCALIZATION NOTE (dcharIso8Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!-- LOCALIZATION NOTE (dcharCp1255Cmd.label) : Do not translate "windows-1255" in below line. -->
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!-- LOCALIZATION NOTE (dcharCp1256Cmd.label) : Do not translate "windows-1256" in below line. -->
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
+<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
+<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
+<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
+<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
 
 <!-- Search Menu -->
 <!ENTITY searchMenu.label "Search">
diff --git a/mailnews/compose/resources/locale/en-US/messengercompose.dtd b/mailnews/compose/resources/locale/en-US/messengercompose.dtd
index 6c668aa0d821..68cc24dec4a8 100644
--- a/mailnews/compose/resources/locale/en-US/messengercompose.dtd
+++ b/mailnews/compose/resources/locale/en-US/messengercompose.dtd
@@ -41,22 +41,21 @@
 <!ENTITY attachmentsCmd.label ".Attachments">
 <!ENTITY wrapCmd.label ".Wrap Long Lines">
 <!ENTITY dcharMenu.label "Character Set">
-<!--LOCALIZATION NOTE dcharIso1Cmd.label Don't change any of the ISO numbers here -->
 <!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
 <!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "Esperanto/Maltese (ISO-8859-3)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
 <!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
 <!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "Northern European (ISO-8859-10)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
 <!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "New Western (ISO-8859-15)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
 <!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf8Cmd.label "UTF-8">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
 <!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
 <!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 7d5b56376a3a..64baa3855f73 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -287,119 +287,87 @@ Contributor(s): ______________________________________. -->
         </menupopup>
       </menu>
 
-      <menu value="&dcharMenu.label;">
-        <menupopup>
-          <menuitem value="&dcharIso1Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-1');" />
-          <menuitem value="&dcharIso2Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-2');"/>
-          <menuitem value="&dcharIso3Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-3');"/>
-          <menuitem value="&dcharIso4Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-4');"/>
-          <menuitem value="&dcharIso9Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-9');"/>
-          <menuitem value="&dcharIso10Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-10');"/>
-          <menuitem value="&dcharIso13Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-13');"/>
-          <menuitem value="&dcharIso14Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-14');"/>
-          <menuitem value="&dcharIso15Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-15');"/>
-          <menuitem value="&dcharWinLat2Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1250');"/>
-          <menuitem value="&dcharWinLat1Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1252');"/>
-          <menuitem value="&dcharWinLat5Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1254');"/>
-          <menuitem value="&dcharWinBalRimCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1257');"/>
-          <menuitem value="&dcharMacRomCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-roman');"/>
-          <menuitem value="&dcharMacCenEuroCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-ce');"/>
-          <menuitem value="&dcharMacTurCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-turkish');"/>
-          <menuitem value="&dcharMacCroaCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-croatian');"/>
-          <menuitem value="&dcharMacRomanianCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-romanian');"/>
-          <menuitem value="&dcharMacIceCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-icelandic');"/>
-          <menuseparator />
-          <menuitem value="&dcharJapanCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-2022-JP');"/>
-          <menuitem value="&dcharJapanShiftjsCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('Shift_JIS');"/>
-          <menuitem value="&dcharJapanEucCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('EUC-JP');"/>
-          <menuseparator />
-          <menuitem value="&dcharTradChiBigCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('Big5');"/>
-          <menuitem value="&dcharTriChiEucCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-euc-tw');"/>
-          <menuitem value="&dcharSimpChiGbCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('GB2312');"/>
-          <menuseparator />
-          <menuitem value="&dcharKoreanCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('EUC-KR');"/>
-          <menuseparator />
-          <menuitem value="&dcharUtf7Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('UTF-7');"/>
-          <menuitem value="&dcharUtf8Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('UTF-8');"/>
-          <menuseparator />
-          <menuitem value="&dcharIsoCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-5');"/>
-          <menuitem value="&dcharEcmaCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-IR-111');"/>
-          <menuitem value="&dcharWinCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1251');"/>
-          <menuitem value="&dcharDosCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('IBM866');"/>
-          <menuitem value="&dcharMacCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-cyrillic');"/>
-          <menuitem value="&dcharMacUkrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-ukrainian');"/>
-          <menuitem value="&dcharRusCmd.label; "
-            oncommand="BrowserSetDefaultCharacterSet('KOI8-R');"/>
-          <menuitem value="&dcharUkrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('KOI8-U');"/>
-          <menuseparator />
-          <menuitem value="&dcharIsoGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-7');"/>
-          <menuitem value="&dcharWinGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1253');"/>
-          <menuitem value="&dcharMacGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-greek');"/>
-          <menuseparator />
-          <menuitem value="&dcharWinVietCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1258');"/>
-          <menuitem value="&dcharVietTcnCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-viet-tcvn5712');"/>
-          <menuitem value="&dcharVietViCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('VISCII');"/>
-          <menuitem value="&dcharVieVpCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-viet-vps');"/>
-          <menuseparator />
-          <menuitem value="&dcharThaiCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('TIS-620');"/>
-          <menuseparator />
-          <menuitem value="&dcharArmCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ARMSCII-8');"/>
-          <menuseparator />
-          <menuitem value="&dcharIso6Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-6');"/>
-          <menuitem value="&dcharCp1256Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1256');"/>
-          <menuseparator />
-          <menuitem value="&dcharIso8Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-8');"/>
-          <menuitem value="&dcharCp1255Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1255');"/>
-        </menupopup>
-      </menu>
+                  <menuseparator />
+                <menu value="&dcharMenu.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharIso1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-1');"/>
+                                 <menuitem value="&dcharIso15Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-15');"/>
+                                 <menuitem value="&dcharIso2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-2');"/>
+                                 <menuitem value="&dcharIso3Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-3');"/>
+                                 <menuitem value="&dcharIso4Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-4');"/>
+                                 <menuitem value="&dcharIsoGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-7');"/>
+                                 <menuitem value="&dcharIso9Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-9');"/>
+                                 <menuitem value="&dcharIso10Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-10');"/>
+                                 <menuitem value="&dcharIso13Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-13');"/>
+                                 <menuitem value="&dcharIso14Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-14');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu1.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharJapanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-2022-JP');"/>
+                                 <menuitem value="&dcharJapanShiftjsCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Shift_JIS');"/>
+                                 <menuitem value="&dcharJapanEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-JP');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharTradChiBigCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Big5');"/>
+                                 <menuitem value="&dcharTriChiEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-euc-tw');"/>
+                                 <menuitem value="&dcharSimpChiGbCmd.label;" oncommand="BrowserSetDefaultCharacterSet('GB2312');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharKoreanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-KR');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharUtf7Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-7');"/>
+                                 <menuitem value="&dcharUtf8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-8');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu2.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharRusCmd.label; " oncommand="BrowserSetDefaultCharacterSet('KOI8-R');"/>
+                                 <menuitem value="&dcharIsoCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-5');"/>
+                                 <menuitem value="&dcharWinCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1251');"/>
+                                 <menuitem value="&dcharEcmaCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-IR-111');"/>
+                                 <menuitem value="&dcharDosCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('IBM866');"/>
+                                 <menuitem value="&dcharMacCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-cyrillic');"/>
+                                 <menuitem value="&dcharUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('KOI8-U');"/>
+                                 <menuitem value="&dcharMacUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ukrainian');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu3.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinVietCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1258');"/>
+                                 <menuitem value="&dcharVietTcnCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-tcvn5712');"/>
+                                 <menuitem value="&dcharVietViCmd.label;" oncommand="BrowserSetDefaultCharacterSet('VISCII');"/>
+                                 <menuitem value="&dcharVieVpCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-vps');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharThaiCmd.label;" oncommand="BrowserSetDefaultCharacterSet('TIS-620');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharArmCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ARMSCII-8');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso6Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-6');"/>
+                                 <menuitem value="&dcharCp1256Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1256');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-8');"/>
+                                 <menuitem value="&dcharCp1255Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1255');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu4.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharMacRomCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-roman');"/>
+                                 <menuitem value="&dcharMacCenEuroCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ce');"/>
+                                 <menuitem value="&dcharMacTurCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-turkish');"/>
+                                 <menuitem value="&dcharMacCroaCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-croatian');"/>
+                                 <menuitem value="&dcharMacRomanianCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-romanian');"/>
+                                 <menuitem value="&dcharMacIceCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-icelandic');"/>
+                                 <menuitem value="&dcharMacGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-greek');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu5.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinLat1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1252');"/>
+                                 <menuitem value="&dcharWinLat2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1250');"/>
+                                 <menuitem value="&dcharWinLat5Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1254');"/>
+                                 <menuitem value="&dcharWinBalRimCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1257');"/>
+                                 <menuitem value="&dcharWinGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1253');"/>
+                        </menupopup>
+                 </menu>
       <menu id = "charsetMenu" />
       <menu id="CharsetDetectorsMenu" />
    </menupopup>
diff --git a/suite/debugQA/content/debugQATextEditorShell.xul b/suite/debugQA/content/debugQATextEditorShell.xul
index 643c4fc6a906..12d8688d9468 100644
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -70,6 +70,11 @@
       <menuitem id="viewSourceMenuitem"/>
       <menuseparator />
       <menu id="charsetMenu"/>
+      <menu id="charsetMenu1"/>
+      <menu id="charsetMenu2"/>
+      <menu id="charsetMenu3"/>
+      <menu id="charsetMenu4"/>
+      <menu id="charsetMenu5"/>
     </menupopup>
     </menu>
  
diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
index 702fe6683414..8e06fb501240 100644
--- a/suite/locales/en-US/chrome/browser/navigator.dtd
+++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -86,56 +86,61 @@
 <!ENTITY tanslateSpantoEngCmd.label "Spanish to English">
 <!ENTITY translateSpantoFrenCmd.label "Spanish to French">
 <!ENTITY translateSpantoGermCmd.label "Spanish to German">
-<!ENTITY dcharMenu.label "Character Set">
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
+<!ENTITY dcharMenu.label "Character Set  ISO">
+<!ENTITY dcharMenu1.label "Character Set  Multibyte">
+<!ENTITY dcharMenu2.label "Character Set  Cyrillic">
+<!ENTITY dcharMenu3.label "Character Set  SE Asian/Armenian/Semitic">
+<!ENTITY dcharMenu4.label "Character Set  Macintosh">
+<!ENTITY dcharMenu5.label "Character Set  Windows">
+<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
+<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
+<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
+<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
+<!ENTITY dcharIso13Cmd.label "Greek (ISO-8859-13)">
+<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
+<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)"> 
+<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
+<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
+<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
+<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
+<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
+<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
+<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
+<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
+<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
+<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
 <!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
 <!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!ENTITY dcharWinVietCmd.label "Windows Vietnamese (windows-1258)">
+<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
+<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
+<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
+<!ENTITY dcharDosCyrCmd.label "Cyrillic (IBM866)">
+<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
+<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
+<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
+<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
+<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
+<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
+<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
+<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
 <!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
 <!ENTITY dcharVieVpCmd.label "Vietnamese (VPS)">
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
+<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
+<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
+<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
+<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
 <!ENTITY searchMenu.label "Search">
 <!ENTITY findOnCmd.label "Find On this page...">
 <!ENTITY findAgainCmd.label "Find Again">
diff --git a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
index 6c668aa0d821..68cc24dec4a8 100644
--- a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -41,22 +41,21 @@
 <!ENTITY attachmentsCmd.label ".Attachments">
 <!ENTITY wrapCmd.label ".Wrap Long Lines">
 <!ENTITY dcharMenu.label "Character Set">
-<!--LOCALIZATION NOTE dcharIso1Cmd.label Don't change any of the ISO numbers here -->
 <!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
 <!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "Esperanto/Maltese (ISO-8859-3)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
 <!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
 <!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "Northern European (ISO-8859-10)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
 <!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "New Western (ISO-8859-15)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
 <!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf8Cmd.label "UTF-8">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
 <!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
 <!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
diff --git a/suite/locales/en-US/chrome/mailnews/messenger.dtd b/suite/locales/en-US/chrome/mailnews/messenger.dtd
index b5afac18f1a5..5293718cb43a 100644
--- a/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -111,96 +111,61 @@ Rights Reserved.
 <!ENTITY pageInfoCmd.label ".Page Info">  
 <!ENTITY charSetMenu.label "Character Set"> 
 <!ENTITY translateMenu.label ".Translate"> 
-<!ENTITY dcharMenu.label "Character Set">
-<!-- LOCALIZATION NOTE (dcharIso1Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!-- LOCALIZATION NOTE (dcharIso2Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!-- LOCALIZATION NOTE (dcharIso3Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!-- LOCALIZATION NOTE (dcharIso4Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!-- LOCALIZATION NOTE (dcharIso9Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!-- LOCALIZATION NOTE (dcharIso10Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!-- LOCALIZATION NOTE (dcharIso13Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!-- LOCALIZATION NOTE (dcharIso14Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!-- LOCALIZATION NOTE (dcharIso15Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!-- LOCALIZATION NOTE (dcharWinLat2Cmd.label) : Do not translate "windows-1250" in below line. -->
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!-- LOCALIZATION NOTE (dcharWinLat1Cmd.label) : Do not translate "windows-1252" in below line. -->
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!-- LOCALIZATION NOTE (dcharWinLat5Cmd.label) : Do not translate "windows-1254" in below line. -->
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!-- LOCALIZATION NOTE (dcharWinBalRimCmd.label) : Do not translate "windows-1257" in below line. -->
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!-- LOCALIZATION NOTE (dcharJapanCmd.label) : Do not translate "ISO", "JIS" and "JP" in below line. -->
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
-<!-- LOCALIZATION NOTE (dcharJapanShiftjsCmd.label) : Do not translate "Shift_JIS" in below line. -->
+<!ENTITY dcharMenu.label "Character Set  ISO">
+<!ENTITY dcharMenu1.label "Character Set  Multibyte">
+<!ENTITY dcharMenu2.label "Character Set  Cyrillic">
+<!ENTITY dcharMenu3.label "Character Set  SE Asian/Armenian/Semitic">
+<!ENTITY dcharMenu4.label "Character Set  Macintosh">
+<!ENTITY dcharMenu5.label "Character Set  Windows">
+<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
+<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
+<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
+<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
+<!ENTITY dcharIso13Cmd.label "Greek (ISO-8859-13)">
+<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
+<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)"> 
+<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
+<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
+<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
+<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
+<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
+<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
+<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
+<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
+<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
+<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
 <!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
-<!-- LOCALIZATION NOTE (dcharJapanEucCmd.label) : Do not translate "EUC-JP" in below line. -->
 <!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!-- LOCALIZATION NOTE (dcharTradChiBigCmd.label) : Do not translate "Big5" in below line. -->
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!-- LOCALIZATION NOTE (dcharTriChiEucCmd.label) : Do not translate "EUC-TW" in below line. -->
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!-- LOCALIZATION NOTE (dcharSimpChiGbCmd.label) : Do not translate "GB2312" in below line. -->
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
-<!-- LOCALIZATION NOTE (dcharKoreanCmd.label) : Do not translate "EUC-KR" in below line. -->
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!-- LOCALIZATION NOTE (dcharUtf7Cmd.label) : Do not translate "UTF-7" in below line. -->
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!-- LOCALIZATION NOTE (dcharUtf8Cmd.label) : Do not translate "UTF-8" in below line. -->
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!-- LOCALIZATION NOTE (dcharIsoCyrCmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!-- LOCALIZATION NOTE (dcharEcmaCyrCmd.label) : Do not translate "ECMA", "ISO" and "IR" in below line. -->
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!-- LOCALIZATION NOTE (dcharDosCyrCmd.label) : Do not translate "DOS" and "IBM" in below line. -->
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!-- LOCALIZATION NOTE (dcharWinCyrCmd.label) : Do not translate "windows-1251" in below line. -->
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!-- LOCALIZATION NOTE (dcharRusCmd.label) : Do not translate "KOI8-R" in below line. -->
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!-- LOCALIZATION NOTE (dcharUkrCmd.label) : Do not translate "KOI8-U" in below line. -->
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!-- LOCALIZATION NOTE (dcharIsoGreekCmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!-- LOCALIZATION NOTE (dcharWinGreekCmd.label) : Do not translate "windows-1253" in below line. -->
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!-- LOCALIZATION NOTE (dcharWinVietCmd.label) : Do not translate "windows-1258" in below line. -->
-<!ENTITY dcharWinVietCmd.label "Windows Vietnamese (windows-1258)">
-<!-- LOCALIZATION NOTE (dcharVietTcnCmd.label) : Do not translate "TCVN5712" in below line. -->
+<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
+<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
+<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
+<!ENTITY dcharDosCyrCmd.label "Cyrillic (IBM866)">
+<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
+<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
+<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
+<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
+<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
+<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
+<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
+<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
 <!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
-<!-- LOCALIZATION NOTE (dcharVietViCmd.label) : Do not translate "VISCII" in below line. -->
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
-<!-- LOCALIZATION NOTE (dcharVieVpCmd.label) : Do not translate "VPS" in below line. -->
 <!ENTITY dcharVieVpCmd.label "Vietnamese (VPS)">
-<!-- LOCALIZATION NOTE (dcharThaiCmd.label) : Do not translate "TIS-620" in below line. -->
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
-<!-- LOCALIZATION NOTE (dcharArmCmd.label) : Do not translate "ARMSCII-8" in below line. -->
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!-- LOCALIZATION NOTE (dcharIso6Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!-- LOCALIZATION NOTE (dcharIso8Cmd.label) : Do not translate "ISO" in below line. -->
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!-- LOCALIZATION NOTE (dcharCp1255Cmd.label) : Do not translate "windows-1255" in below line. -->
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!-- LOCALIZATION NOTE (dcharCp1256Cmd.label) : Do not translate "windows-1256" in below line. -->
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
+<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
+<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
+<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
+<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
 
 <!-- Search Menu -->
 <!ENTITY searchMenu.label "Search">
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 7d5b56376a3a..64baa3855f73 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -287,119 +287,87 @@ Contributor(s): ______________________________________. -->
         </menupopup>
       </menu>
 
-      <menu value="&dcharMenu.label;">
-        <menupopup>
-          <menuitem value="&dcharIso1Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-1');" />
-          <menuitem value="&dcharIso2Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-2');"/>
-          <menuitem value="&dcharIso3Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-3');"/>
-          <menuitem value="&dcharIso4Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-4');"/>
-          <menuitem value="&dcharIso9Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-9');"/>
-          <menuitem value="&dcharIso10Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-10');"/>
-          <menuitem value="&dcharIso13Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-13');"/>
-          <menuitem value="&dcharIso14Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-14');"/>
-          <menuitem value="&dcharIso15Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-15');"/>
-          <menuitem value="&dcharWinLat2Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1250');"/>
-          <menuitem value="&dcharWinLat1Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1252');"/>
-          <menuitem value="&dcharWinLat5Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1254');"/>
-          <menuitem value="&dcharWinBalRimCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1257');"/>
-          <menuitem value="&dcharMacRomCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-roman');"/>
-          <menuitem value="&dcharMacCenEuroCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-ce');"/>
-          <menuitem value="&dcharMacTurCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-turkish');"/>
-          <menuitem value="&dcharMacCroaCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-croatian');"/>
-          <menuitem value="&dcharMacRomanianCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-romanian');"/>
-          <menuitem value="&dcharMacIceCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-icelandic');"/>
-          <menuseparator />
-          <menuitem value="&dcharJapanCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-2022-JP');"/>
-          <menuitem value="&dcharJapanShiftjsCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('Shift_JIS');"/>
-          <menuitem value="&dcharJapanEucCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('EUC-JP');"/>
-          <menuseparator />
-          <menuitem value="&dcharTradChiBigCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('Big5');"/>
-          <menuitem value="&dcharTriChiEucCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-euc-tw');"/>
-          <menuitem value="&dcharSimpChiGbCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('GB2312');"/>
-          <menuseparator />
-          <menuitem value="&dcharKoreanCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('EUC-KR');"/>
-          <menuseparator />
-          <menuitem value="&dcharUtf7Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('UTF-7');"/>
-          <menuitem value="&dcharUtf8Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('UTF-8');"/>
-          <menuseparator />
-          <menuitem value="&dcharIsoCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-5');"/>
-          <menuitem value="&dcharEcmaCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-IR-111');"/>
-          <menuitem value="&dcharWinCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1251');"/>
-          <menuitem value="&dcharDosCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('IBM866');"/>
-          <menuitem value="&dcharMacCyrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-cyrillic');"/>
-          <menuitem value="&dcharMacUkrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-ukrainian');"/>
-          <menuitem value="&dcharRusCmd.label; "
-            oncommand="BrowserSetDefaultCharacterSet('KOI8-R');"/>
-          <menuitem value="&dcharUkrCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('KOI8-U');"/>
-          <menuseparator />
-          <menuitem value="&dcharIsoGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-7');"/>
-          <menuitem value="&dcharWinGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1253');"/>
-          <menuitem value="&dcharMacGreekCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-mac-greek');"/>
-          <menuseparator />
-          <menuitem value="&dcharWinVietCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1258');"/>
-          <menuitem value="&dcharVietTcnCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-viet-tcvn5712');"/>
-          <menuitem value="&dcharVietViCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('VISCII');"/>
-          <menuitem value="&dcharVieVpCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('x-viet-vps');"/>
-          <menuseparator />
-          <menuitem value="&dcharThaiCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('TIS-620');"/>
-          <menuseparator />
-          <menuitem value="&dcharArmCmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ARMSCII-8');"/>
-          <menuseparator />
-          <menuitem value="&dcharIso6Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-6');"/>
-          <menuitem value="&dcharCp1256Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1256');"/>
-          <menuseparator />
-          <menuitem value="&dcharIso8Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('ISO-8859-8');"/>
-          <menuitem value="&dcharCp1255Cmd.label;"
-            oncommand="BrowserSetDefaultCharacterSet('windows-1255');"/>
-        </menupopup>
-      </menu>
+                  <menuseparator />
+                <menu value="&dcharMenu.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharIso1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-1');"/>
+                                 <menuitem value="&dcharIso15Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-15');"/>
+                                 <menuitem value="&dcharIso2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-2');"/>
+                                 <menuitem value="&dcharIso3Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-3');"/>
+                                 <menuitem value="&dcharIso4Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-4');"/>
+                                 <menuitem value="&dcharIsoGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-7');"/>
+                                 <menuitem value="&dcharIso9Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-9');"/>
+                                 <menuitem value="&dcharIso10Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-10');"/>
+                                 <menuitem value="&dcharIso13Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-13');"/>
+                                 <menuitem value="&dcharIso14Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-14');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu1.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharJapanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-2022-JP');"/>
+                                 <menuitem value="&dcharJapanShiftjsCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Shift_JIS');"/>
+                                 <menuitem value="&dcharJapanEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-JP');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharTradChiBigCmd.label;" oncommand="BrowserSetDefaultCharacterSet('Big5');"/>
+                                 <menuitem value="&dcharTriChiEucCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-euc-tw');"/>
+                                 <menuitem value="&dcharSimpChiGbCmd.label;" oncommand="BrowserSetDefaultCharacterSet('GB2312');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharKoreanCmd.label;" oncommand="BrowserSetDefaultCharacterSet('EUC-KR');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharUtf7Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-7');"/>
+                                 <menuitem value="&dcharUtf8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('UTF-8');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu2.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharRusCmd.label; " oncommand="BrowserSetDefaultCharacterSet('KOI8-R');"/>
+                                 <menuitem value="&dcharIsoCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-5');"/>
+                                 <menuitem value="&dcharWinCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1251');"/>
+                                 <menuitem value="&dcharEcmaCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-IR-111');"/>
+                                 <menuitem value="&dcharDosCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('IBM866');"/>
+                                 <menuitem value="&dcharMacCyrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-cyrillic');"/>
+                                 <menuitem value="&dcharUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('KOI8-U');"/>
+                                 <menuitem value="&dcharMacUkrCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ukrainian');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu3.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinVietCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1258');"/>
+                                 <menuitem value="&dcharVietTcnCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-tcvn5712');"/>
+                                 <menuitem value="&dcharVietViCmd.label;" oncommand="BrowserSetDefaultCharacterSet('VISCII');"/>
+                                 <menuitem value="&dcharVieVpCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-viet-vps');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharThaiCmd.label;" oncommand="BrowserSetDefaultCharacterSet('TIS-620');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharArmCmd.label;" oncommand="BrowserSetDefaultCharacterSet('ARMSCII-8');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso6Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-6');"/>
+                                 <menuitem value="&dcharCp1256Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1256');"/>
+                                         <menuseparator />
+                                 <menuitem value="&dcharIso8Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('ISO-8859-8');"/>
+                                 <menuitem value="&dcharCp1255Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1255');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu4.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharMacRomCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-roman');"/>
+                                 <menuitem value="&dcharMacCenEuroCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-ce');"/>
+                                 <menuitem value="&dcharMacTurCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-turkish');"/>
+                                 <menuitem value="&dcharMacCroaCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-croatian');"/>
+                                 <menuitem value="&dcharMacRomanianCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-romanian');"/>
+                                 <menuitem value="&dcharMacIceCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-icelandic');"/>
+                                 <menuitem value="&dcharMacGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('x-mac-greek');"/>
+                        </menupopup>
+                 </menu>
+                 <menu value="&dcharMenu5.label;">
+                     <menupopup>
+                                 <menuitem value="&dcharWinLat1Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1252');"/>
+                                 <menuitem value="&dcharWinLat2Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1250');"/>
+                                 <menuitem value="&dcharWinLat5Cmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1254');"/>
+                                 <menuitem value="&dcharWinBalRimCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1257');"/>
+                                 <menuitem value="&dcharWinGreekCmd.label;" oncommand="BrowserSetDefaultCharacterSet('windows-1253');"/>
+                        </menupopup>
+                 </menu>
       <menu id = "charsetMenu" />
       <menu id="CharsetDetectorsMenu" />
    </menupopup>
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 702fe6683414..8e06fb501240 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -86,56 +86,61 @@
 <!ENTITY tanslateSpantoEngCmd.label "Spanish to English">
 <!ENTITY translateSpantoFrenCmd.label "Spanish to French">
 <!ENTITY translateSpantoGermCmd.label "Spanish to German">
-<!ENTITY dcharMenu.label "Character Set">
-<!ENTITY dcharIso1Cmd.label "ISO Latin 1 (ISO-8859-1)">
-<!ENTITY dcharIso2Cmd.label "ISO Latin 2 (ISO-8859-2)">
-<!ENTITY dcharIso3Cmd.label "ISO Latin 3 (ISO-8859-3)">
-<!ENTITY dcharIso4Cmd.label "ISO Latin 4 (ISO-8859-4)">
-<!ENTITY dcharIso9Cmd.label "ISO Latin 5 (ISO-8859-9)">
-<!ENTITY dcharIso10Cmd.label "ISO Latin 6 (ISO-8859-10)">
-<!ENTITY dcharIso13Cmd.label "ISO Latin 7 (ISO-8859-13)">
-<!ENTITY dcharIso14Cmd.label "ISO Latin 8 (ISO-8859-14)">
-<!ENTITY dcharIso15Cmd.label "ISO Latin 9 (ISO-8859-15)">
-<!ENTITY dcharWinLat2Cmd.label "Windows Latin 2 (windows-1250)"> 
-<!ENTITY dcharWinLat1Cmd.label "Windows Latin 1 (windows-1252)">
-<!ENTITY dcharWinLat5Cmd.label "Windows Latin 5 (windows-1254)">
-<!ENTITY dcharWinBalRimCmd.label "Windows Baltic (windows-1257)">
-<!ENTITY dcharMacRomCmd.label "Macintosh Roman">
-<!ENTITY dcharMacCenEuroCmd.label "Macintosh Central European">
-<!ENTITY dcharMacTurCmd.label "Macintosh Turkish">
-<!ENTITY dcharMacCroaCmd.label "Macintosh Croatian">
-<!ENTITY dcharMacRomanianCmd.label "Macintosh Romanian">
-<!ENTITY dcharMacIceCmd.label "Macintosh Icelandic">
-<!ENTITY dcharJapanCmd.label "Japanese JIS (ISO-2022-JP)">
+<!ENTITY dcharMenu.label "Character Set  ISO">
+<!ENTITY dcharMenu1.label "Character Set  Multibyte">
+<!ENTITY dcharMenu2.label "Character Set  Cyrillic">
+<!ENTITY dcharMenu3.label "Character Set  SE Asian/Armenian/Semitic">
+<!ENTITY dcharMenu4.label "Character Set  Macintosh">
+<!ENTITY dcharMenu5.label "Character Set  Windows">
+<!ENTITY dcharIso1Cmd.label "Western (ISO-8859-1)">
+<!ENTITY dcharIso2Cmd.label "Central European (ISO-8859-2)">
+<!ENTITY dcharIso3Cmd.label "South European (ISO-8859-3)">
+<!ENTITY dcharIso4Cmd.label "Baltic (ISO-8859-4)">
+<!ENTITY dcharIso9Cmd.label "Turkish (ISO-8859-9)">
+<!ENTITY dcharIso10Cmd.label "Nordic (ISO-8859-10)">
+<!ENTITY dcharIso13Cmd.label "Greek (ISO-8859-13)">
+<!ENTITY dcharIso14Cmd.label "Celtic (ISO-8859-14)">
+<!ENTITY dcharIso15Cmd.label "Western (ISO-8859-15)">
+<!ENTITY dcharWinLat2Cmd.label "Central European (Windows-1250)"> 
+<!ENTITY dcharWinLat1Cmd.label "Western (Windows-1252)">
+<!ENTITY dcharWinLat5Cmd.label "Turkish (Windows-1254)">
+<!ENTITY dcharWinBalRimCmd.label "Baltic (Windows-1257)">
+<!ENTITY dcharMacRomCmd.label "Western (MacRoman)">
+<!ENTITY dcharMacCenEuroCmd.label "Central European (MacCE)">
+<!ENTITY dcharMacTurCmd.label "Turkish (MacTurkish)">
+<!ENTITY dcharMacCroaCmd.label "Croatian (MacCroatian)">
+<!ENTITY dcharMacRomanianCmd.label "Romanian (MacRomanian)">
+<!ENTITY dcharMacIceCmd.label "Icelandic (MacIcelandic)">
+<!ENTITY dcharJapanCmd.label "Japanese (ISO-2022-JP)">
 <!ENTITY dcharJapanShiftjsCmd.label "Japanese (Shift_JIS)">
 <!ENTITY dcharJapanEucCmd.label "Japanese (EUC-JP)">
-<!ENTITY dcharTradChiBigCmd.label "Traditional Chinese (Big5)">
-<!ENTITY dcharTriChiEucCmd.label "Traditional Chinese (EUC-TW)">
-<!ENTITY dcharSimpChiGbCmd.label "Simplified Chinese (GB2312)">
+<!ENTITY dcharTradChiBigCmd.label "Chinese Traditional (Big5)">
+<!ENTITY dcharTriChiEucCmd.label "Chinese Traditional (EUC-TW)">
+<!ENTITY dcharSimpChiGbCmd.label "Chinese Simplified (GB2312)">
 <!ENTITY dcharKoreanCmd.label "Korean (EUC-KR)">
-<!ENTITY dcharUtf7Cmd.label "Multilingual (UTF-7)">
-<!ENTITY dcharUtf8Cmd.label "Multilingual (UTF-8)">
-<!ENTITY dcharIsoCyrCmd.label "ISO Cyrillic (ISO-8859-5)">
-<!ENTITY dcharEcmaCyrCmd.label "ECMA Cyrillic (ISO-IR-111)">
-<!ENTITY dcharDosCyrCmd.label "DOS Cyrillic (IBM866)">
-<!ENTITY dcharWinCyrCmd.label "Windows Cyrillic (windows-1251)">
-<!ENTITY dcharMacCyrCmd.label "Macintosh Cyrillic">
-<!ENTITY dcharMacUkrCmd.label "Macintosh Ukrainian">
-<!ENTITY dcharRusCmd.label "Russian (KOI8-R)">
-<!ENTITY dcharUkrCmd.label "Ukrainian (KOI8-U)">
-<!ENTITY dcharIsoGreekCmd.label "ISO Greek (ISO-8859-7)">
-<!ENTITY dcharWinGreekCmd.label "Windows Greek (windows-1253)">
-<!ENTITY dcharMacGreekCmd.label "Macintosh Greek">
-<!ENTITY dcharWinVietCmd.label "Windows Vietnamese (windows-1258)">
+<!ENTITY dcharUtf7Cmd.label "Unicode (UTF-7)">
+<!ENTITY dcharUtf8Cmd.label "Unicode (UTF-8)">
+<!ENTITY dcharIsoCyrCmd.label "Cyrillic (ISO-8859-5)">
+<!ENTITY dcharEcmaCyrCmd.label "Cyrillic (ISO-IR-111)">
+<!ENTITY dcharDosCyrCmd.label "Cyrillic (IBM866)">
+<!ENTITY dcharWinCyrCmd.label "Cyrillic (Windows-1251)">
+<!ENTITY dcharMacCyrCmd.label "Cyrillic (MacCyrillic)">
+<!ENTITY dcharMacUkrCmd.label "Cyrillic/Ukrainian (MacUkrainian)">
+<!ENTITY dcharRusCmd.label "Cyrillic (KOI8-R)">
+<!ENTITY dcharUkrCmd.label "Cyrillic/Ukrainian (KOI8-U)">
+<!ENTITY dcharIsoGreekCmd.label "Greek (ISO-8859-7)">
+<!ENTITY dcharWinGreekCmd.label "Greek (Windows-1253)">
+<!ENTITY dcharMacGreekCmd.label "Greek (MacGreek)">
+<!ENTITY dcharWinVietCmd.label "Vietnamese (Windows-1258)">
 <!ENTITY dcharVietTcnCmd.label "Vietnamese (TCVN5712)">
 <!ENTITY dcharVietViCmd.label "Vietnamese (VISCII)">
 <!ENTITY dcharVieVpCmd.label "Vietnamese (VPS)">
 <!ENTITY dcharThaiCmd.label "Thai (TIS-620)">
 <!ENTITY dcharArmCmd.label "Armenian (ARMSCII-8)">
-<!ENTITY dcharIso6Cmd.label ".ISO Arabic (ISO-8859-6)">
-<!ENTITY dcharIso8Cmd.label ".ISO Hebrew (ISO-8859-8)">
-<!ENTITY dcharCp1255Cmd.label "Windows Hebrew (windows-1255)">
-<!ENTITY dcharCp1256Cmd.label "Windows Arabic (windows-1256)">
+<!ENTITY dcharIso6Cmd.label ".Arabic (ISO-8859-6)">
+<!ENTITY dcharIso8Cmd.label ".Hebrew (ISO-8859-8)">
+<!ENTITY dcharCp1255Cmd.label "Hebrew (Windows-1255)">
+<!ENTITY dcharCp1256Cmd.label "Arabic (Windows-1256)">
 <!ENTITY searchMenu.label "Search">
 <!ENTITY findOnCmd.label "Find On this page...">
 <!ENTITY findAgainCmd.label "Find Again">