diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index f244e8ad0b7..701f6d3d0e7 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -120,48 +120,56 @@ Rights Reserved.
 <!ENTITY pageInfoCmd.label ".Page Info">  
 <!ENTITY charSetMenu.label "Character Set"> 
 <!ENTITY translateMenu.label ".Translate"> 
-<!ENTITY ISO_Latin_1Cmd.label "ISO Latin 1 (ISO-8859-1)">  
-<!ENTITY ISO_Latin_2Cmd.label "ISO Latin 2 (ISO-8859-2)">  
-<!ENTITY ISO_Latin_3Cmd.label "ISO Latin 3 (ISO-8859-3)">  
-<!ENTITY ISO_Latin_4Cmd.label "ISO Latin 4 (ISO-8859-4)">  
-<!ENTITY ISO_Latin_5Cmd.label "ISO Latin 5 (ISO-8859-9)">  
-<!ENTITY ISO_Latin_8Cmd.label "ISO Latin 8 (ISO-8859-14)">  
-<!ENTITY ISO_Latin_9Cmd.label "ISO Latin 9 (ISO-8859-15)">  
-<!ENTITY Windows_Latin2Cmd.label "Windows Latin 2 (windows-1250)">  
-<!ENTITY Windows_Latin1Cmd.label "Windows Latin 1 (windows-1252)">  
-<!ENTITY Windows_Latin5Cmd.label "Windows Latin 5 (windows-1254)">  
-<!ENTITY Windows_BalticRimCmd.label "Windows Baltic Rim (windows-1257)">  
-<!ENTITY Macintosh_RomanCmd.label "Macintosh Roman">  
-<!ENTITY Macintosh_CentralEuropeanCmd.label "Macintosh Central European">  
-<!ENTITY Macintosh_TurkishCmd.label "Macintosh Turkish">  
-<!ENTITY Macintosh_CroatianCmd.label "Macintosh Croatian">  
-<!ENTITY Macintosh_RomanianCmd.label "Macintosh Romanian">  
-<!ENTITY Macintosh_IcelandicCmd.label "Macintosh Icelandic">  
-<!ENTITY Japanese_JISCmd.label "Japanese JIS (ISO-2022-JP)">  
-<!ENTITY Japanese_Shift_JISCmd.label "Japanese (Shift_JIS)">  
-<!ENTITY Japanese_EUC_JPCmd.label "Japanese (EUC-JP)">  
-<!ENTITY TraditionalChinese_Big5Cmd.label "Traditional Chinese (Big5)">  
-<!ENTITY TraditionalChinese_EUC_TWCmd.label "Traditional Chinese (EUC-TW)">  
-<!ENTITY SimplifiedChinese_GB2312Cmd.label "Simplified Chinese (GB2312)">  
-<!ENTITY Korean_EUC_KRCmd.label "Korean (EUC-KR)">  
-<!ENTITY Korean_ISO_2022_KRCmd.label "Korean (ISO-2022-KR)">  
-<!ENTITY UTF_7Cmd.label "UTF-7">  
-<!ENTITY UTF_8Cmd.label "UTF-8">  
-<!ENTITY ISO_CyrillicCmd.label "ISO Cyrillic (ISO-8859-5)">  
-<!ENTITY Windows_CyrillicCmd.label "Windows Cyrillic (windows-1251)">  
-<!ENTITY Macintosh_CyrillicCmd.label "Macintosh Cyrillic">  
-<!ENTITY Macintosh_UkrainianCmd.label "Macintosh Ukrainian">  
-<!ENTITY Russian_KOI8_RCmd.label "Russian (KOI8-R)">  
-<!ENTITY Ukrainian_KOI8_UCmd.label "Ukrainian (KOI8-U)">  
-<!ENTITY ISO_GreekCmd.label "ISO Greek (ISO-8859-7)">  
-<!ENTITY Windows_GreekCmd.label "Windows Greek (windows-1253)">  
-<!ENTITY Macintosh_GreekCmd.label "Macintosh Greek">  
-<!ENTITY Windows_VietnameseCmd.label "Windows Vietnamese (windows-1258)">  
-<!ENTITY Vietnamese_TCVN5712Cmd.label "Vietnamese (TCVN5712)">  
-<!ENTITY Vietnamese_VISCIICmd.label "Vietnamese (VISCII)">  
-<!ENTITY Vietnamese_VPSCmd.label "Vietnamese (VPS)">  
-<!ENTITY ThaiCmd.label "Thai (TIS-620)">  
-<!ENTITY ArmenianCmd.label "Armenian (ARMSCII-8)">
+<!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 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 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 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)">
 
 <!-- Search Menu -->
 <!ENTITY searchMenu.label "Search">
@@ -388,57 +396,68 @@ Rights Reserved.
       <menuitem name="&pageSourceCmd.label;" onclick="MsgViewPageSource();"/>
       <menuitem name="&pageInfoCmd.label;" onclick="MsgViewPageInfo();"/>
       <separator/>
-      <menu name="&charSetMenu.label;">
-        <menuitem name="&ISO_Latin_1Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-1');"/>
-        <menuitem name="&ISO_Latin_2Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-2');"/>
-        <menuitem name="&ISO_Latin_3Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-3');"/>
-        <menuitem name="&ISO_Latin_4Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-4');"/>
-        <menuitem name="&ISO_Latin_5Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-9');"/>
-        <menuitem name="&ISO_Latin_8Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-14');"/>
-        <menuitem name="&ISO_Latin_9Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-15');"/>
-        <menuitem name="&Windows_Latin2Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1250');"/>
-        <menuitem name="&Windows_Latin1Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1252');"/>
-        <menuitem name="&Windows_Latin5Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1254');"/>
-        <menuitem name="&Windows_BalticRimCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1257');"/>
-        <menuitem name="&Macintosh_RomanCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-roman');"/>
-        <menuitem name="&Macintosh_CentralEuropeanCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-ce');"/>
-        <menuitem name="&Macintosh_TurkishCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-turkish');"/>
-        <menuitem name="&Macintosh_CroatianCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-croatian');"/>
-        <menuitem name="&Macintosh_RomanianCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-romanian');"/>
-        <menuitem name="&Macintosh_IcelandicCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-icelandic');"/>
-             <separator />
-        <menuitem name="&Japanese_JISCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-2022-JP');"/>
-        <menuitem name="&Japanese_Shift_JISCmd.label;" onclick="MessengerSetDefaultCharacterSet('Shift_JIS');"/>
-        <menuitem name="&Japanese_EUC_JPCmd.label;" onclick="MessengerSetDefaultCharacterSet('EUC-JP');"/>
-             <separator />
-        <menuitem name="&TraditionalChinese_Big5Cmd.label;" onclick="MessengerSetDefaultCharacterSet('Big5');"/>
-        <menuitem name="&TraditionalChinese_EUC_TWCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-euc-tw');"/>
-        <menuitem name="&SimplifiedChinese_GB2312Cmd.label;" onclick="MessengerSetDefaultCharacterSet('GB2312');"/>
-             <separator />
-        <menuitem name="&Korean_EUC_KRCmd.label;" onclick="MessengerSetDefaultCharacterSet('EUC-KR');"/>
-             <separator />
-        <menuitem name="&UTF_8Cmd.label;" onclick="MessengerSetDefaultCharacterSet('UTF-8');"/>
-             <separator />
-        <menuitem name="&ISO_CyrillicCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-5');"/>
-        <menuitem name="&Windows_CyrillicCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1251');"/>
-        <menuitem name="&Macintosh_CyrillicCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-cyrillic');"/>
-        <menuitem name="&Macintosh_UkrainianCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-ukrainian');"/>
-        <menuitem name="&Russian_KOI8_RCmd.label;" onclick="MessengerSetDefaultCharacterSet('KOI8-R');"/>
-        <menuitem name="&Ukrainian_KOI8_UCmd.label;" onclick="MessengerSetDefaultCharacterSet('KOI8-U');"/>
-             <separator />
-        <menuitem name="&ISO_GreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-7');"/>
-        <menuitem name="&Windows_GreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1253');"/>
-        <menuitem name="&Macintosh_GreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-greek');"/>
-             <separator />
-        <menuitem name="&Windows_VietnameseCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1258');"/>
-        <menuitem name="&Vietnamese_TCVN5712Cmd.label;" onclick="MessengerSetDefaultCharacterSet('x-viet-tcvn5712');"/>
-        <menuitem name="&Vietnamese_VISCIICmd.label;" onclick="MessengerSetDefaultCharacterSet('VISCII');"/>
-        <menuitem name="&Vietnamese_VPSCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-viet-vps');"/>
-             <separator />
-        <menuitem name="&ThaiCmd.label;" onclick="MessengerSetDefaultCharacterSet('TIS-620');"/>
-             <separator />
-        <menuitem name="&ArmenianCmd.label;" onclick="MessengerSetDefaultCharacterSet('ARMSCII-8');"/>
-      </menu>
+      <menu name="&dcharMenu.label;">
+	         <menuitem name="&dcharIso1Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-1');"/>
+	         <menuitem name="&dcharIso2Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-2');"/>
+	         <menuitem name="&dcharIso3Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-3');"/>
+	         <menuitem name="&dcharIso4Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-4');"/>
+	         <menuitem name="&dcharIso9Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-9');"/>
+	         <menuitem name="&dcharIso10Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-10');"/>
+	         <menuitem name="&dcharIso13Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-13');"/>
+	         <menuitem name="&dcharIso14Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-14');"/>
+	         <menuitem name="&dcharIso15Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-15');"/>
+	         <menuitem name="&dcharWinLat2Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1250');"/>
+	         <menuitem name="&dcharWinLat1Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1252');"/>
+	         <menuitem name="&dcharWinLat5Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1254');"/>
+	         <menuitem name="&dcharWinBalRimCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1257');"/>
+	         <menuitem name="&dcharMacRomCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-roman');"/>
+	         <menuitem name="&dcharMacCenEuroCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-ce');"/>
+	         <menuitem name="&dcharMacTurCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-turkish');"/>
+	         <menuitem name="&dcharMacCroaCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-croatian');"/>
+	         <menuitem name="&dcharMacRomanianCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-romanian');"/>
+	         <menuitem name="&dcharMacIceCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-icelandic');"/>
+                 <separator />
+	         <menuitem name="&dcharJapanCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-2022-JP');"/>
+	         <menuitem name="&dcharJapanShiftjsCmd.label;" onclick="MessengerSetDefaultCharacterSet('Shift_JIS');"/>
+	         <menuitem name="&dcharJapanEucCmd.label;" onclick="MessengerSetDefaultCharacterSet('EUC-JP');"/>
+                 <separator />
+	         <menuitem name="&dcharTradChiBigCmd.label;" onclick="MessengerSetDefaultCharacterSet('Big5');"/>
+	         <menuitem name="&dcharTriChiEucCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-euc-tw');"/>
+	         <menuitem name="&dcharSimpChiGbCmd.label;" onclick="MessengerSetDefaultCharacterSet('GB2312');"/>
+                 <separator />
+ 	         <menuitem name="&dcharKoreanCmd.label;" onclick="MessengerSetDefaultCharacterSet('EUC-KR');"/>
+                 <separator />
+	         <menuitem name="&dcharUtf7Cmd.label;" onclick="MessengerSetDefaultCharacterSet('UTF-7');"/>
+	         <menuitem name="&dcharUtf8Cmd.label;" onclick="MessengerSetDefaultCharacterSet('UTF-8');"/>
+                 <separator />
+	         <menuitem name="&dcharIsoCyrCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-5');"/>
+	         <menuitem name="&dcharEcmaCyrCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-IR-111');"/>
+	         <menuitem name="&dcharWinCyrCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1251');"/>
+	         <menuitem name="&dcharDosCyrCmd.label;" onclick="MessengerSetDefaultCharacterSet('IBM866');"/>
+	         <menuitem name="&dcharMacCyrCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-cyrillic');"/>
+	         <menuitem name="&dcharMacUkrCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-ukrainian');"/>
+	         <menuitem name="&dcharRusCmd.label; " onclick="MessengerSetDefaultCharacterSet('KOI8-R');"/>
+	         <menuitem name="&dcharUkrCmd.label;" onclick="MessengerSetDefaultCharacterSet('KOI8-U');"/>
+                 <separator />
+	         <menuitem name="&dcharIsoGreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-7');"/>
+	         <menuitem name="&dcharWinGreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1253');"/>
+	         <menuitem name="&dcharMacGreekCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-mac-greek');"/>
+                 <separator />
+	         <menuitem name="&dcharWinVietCmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1258');"/>
+	         <menuitem name="&dcharVietTcnCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-viet-tcvn5712');"/>
+	         <menuitem name="&dcharVietViCmd.label;" onclick="MessengerSetDefaultCharacterSet('VISCII');"/>
+	         <menuitem name="&dcharVieVpCmd.label;" onclick="MessengerSetDefaultCharacterSet('x-viet-vps');"/>
+                 <separator />
+	         <menuitem name="&dcharThaiCmd.label;" onclick="MessengerSetDefaultCharacterSet('TIS-620');"/>
+                 <separator />
+	         <menuitem name="&dcharArmCmd.label;" onclick="MessengerSetDefaultCharacterSet('ARMSCII-8');"/>
+                 <separator />
+	         <menuitem name="&dcharIso6Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-6');"/>
+	         <menuitem name="&dcharCp1256Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1256');"/>
+                 <separator />
+	         <menuitem name="&dcharIso8Cmd.label;" onclick="MessengerSetDefaultCharacterSet('ISO-8859-8');"/>
+	         <menuitem name="&dcharCp1255Cmd.label;" onclick="MessengerSetDefaultCharacterSet('windows-1255');"/>
+	   </menu>
     </menu>
     <menu name ="&searchMenu.label;">
         <menuitem name="&findCmd.label;" onclick="MsgFind();"/>