--- a/mail/locales/en-US/chrome/messenger/charsetTitles.properties
+++ b/mail/locales/en-US/chrome/messenger/charsetTitles.properties
@@ -34,20 +34,18 @@ iso-2022-jp.title = Japanese (ISO-2022-J
 shift_jis.title = Japanese (Shift_JIS)
 euc-jp.title = Japanese (EUC-JP)
 big5.title = Chinese Traditional (Big5)
 big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
 x-euc-tw.title = Chinese Traditional (EUC-TW)
 gb2312.title = Chinese Simplified (GB2312)
 hz-gb-2312.title = Chinese Simplified (HZ)
 gbk.title = Chinese Simplified (GBK)
-iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
-iso-2022-kr.title = Korean (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title = Cyrillic (ISO-8859-5)
 iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)

--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -34,17 +34,16 @@ us-ascii.notForOutgoing                 
 iso-8859-6-e.notForOutgoing             = true
 iso-8859-6-i.notForOutgoing             = true
 ibm864.notForOutgoing                   = true
 ibm869.notForOutgoing                   = true
 ibm1125.notForOutgoing                  = true
 ibm1131.notForOutgoing                  = true
 iso-8859-8-e.notForOutgoing             = true
 iso-8859-8.notForOutgoing               = true
-iso-2022-kr.notForOutgoing              = true
 x-johab.notForOutgoing                  = true
 replacement.notForOutgoing              = true
 
 # XXX : there are some entries only necessary for Gtk/Xlib builds
 # to map  XLFD registry-encoding pairs to langGroups. they can be
 # removed once bug 215537 is fixed.
 
 # XXX : todo: move to something based on BCP 47 (RFC 5646);
@@ -82,19 +81,17 @@ ibm852.LangGroup                   = x-c
 ibm855.LangGroup                   = x-cyrillic
 ibm857.LangGroup                   = tr
 ibm862.LangGroup                   = he
 ibm864.LangGroup                   = ar
 ibm866.LangGroup                   = x-cyrillic
 ibm869.LangGroup                   = el
 ibm1125.LangGroup                  = x-cyrillic
 ibm1131.LangGroup                  = x-cyrillic
-iso-2022-cn.LangGroup              = zh-CN
 iso-2022-jp.LangGroup              = ja
-iso-2022-kr.LangGroup              = ko
 iso-8859-1.LangGroup               = x-western
 iso-8859-10.LangGroup              = x-western
 iso-8859-14.LangGroup              = x-western
 iso-8859-15.LangGroup              = x-western
 iso-8859-2.LangGroup               = x-central-euro
 iso-8859-16.LangGroup              = x-central-euro
 iso-8859-3.LangGroup               = x-western
 iso-8859-4.LangGroup               = x-baltic
@@ -159,14 +156,13 @@ x-mac-arabic.LangGroup             = ar
 iso-2022-jp.isMultibyte     = true
 shift_jis.isMultibyte       = true
 euc-jp.isMultibyte          = true
 big5.isMultibyte            = true
 big5-hkscs.isMultibyte      = true
 x-euc-tw.isMultibyte        = true
 gb2312.isMultibyte          = true
 hz-gb-2312.isMultibyte      = true
-iso-2022-kr.isMultibyte     = true
 euc-kr.isMultibyte          = true
 x-johab.isMultibyte         = true
 utf-7.isMultibyte           = true
 utf-8.isMultibyte           = true
 replacement.isMultibyte     = true

--- a/mailnews/intl/charsetalias.properties
+++ b/mailnews/intl/charsetalias.properties
@@ -28,19 +28,16 @@ ascii=us-ascii
 us-ascii=us-ascii
 ansi_x3.4-1968=us-ascii
 646=us-ascii
 iso-8859-1=ISO-8859-1
 iso-8859-6-i=ISO-8859-6-I
 iso-8859-6-e=ISO-8859-6-E
 iso-8859-8-e=ISO-8859-8-E
 iso-ir-111=ISO-IR-111
-iso-2022-cn=ISO-2022-CN
-iso-2022-cn-ext=ISO-2022-CN
-iso-2022-kr=ISO-2022-KR
 utf-16=UTF-16
 ibm850=IBM850
 ibm852=IBM852
 ibm855=IBM855
 ibm857=IBM857
 ibm862=IBM862
 ibm864=IBM864
 utf-7=UTF-7
@@ -183,19 +180,16 @@ iso-10646-unicode-latin1=UTF-16BE
 csunicodelatin1=UTF-16BE
 iso-10646=UTF-16BE
 iso-10646-j-1=UTF-16BE
 
 # Aliases for ISO-IR-111
 ecma-cyrillic=ISO-IR-111
 csiso111ecmacyrillic=ISO-IR-111
 
-# Aliases for ISO-2022-KR
-csiso2022kr=ISO-2022-KR
-
 # Aliases for VISCII
 csviscii=VISCII
 
 # Aliases for x-euc-tw
 zh_tw-euc=x-euc-tw
 
 # Following names appears in unix nl_langinfo(CODESET)
 # They can be compiled as platform specific if necessary

--- a/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
+++ b/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
@@ -34,20 +34,18 @@ iso-2022-jp.title = Japanese (ISO-2022-J
 shift_jis.title = Japanese (Shift_JIS)
 euc-jp.title = Japanese (EUC-JP)
 big5.title = Chinese Traditional (Big5)
 big5-hkscs.title = Chinese Traditional (Big5-HKSCS)
 x-euc-tw.title = Chinese Traditional (EUC-TW)
 gb2312.title = Chinese Simplified (GB2312)
 hz-gb-2312.title = Chinese Simplified (HZ)
 gbk.title = Chinese Simplified (GBK)
-iso-2022-cn.title = Chinese Simplified (ISO-2022-CN)
 euc-kr.title = Korean (EUC-KR)
 x-johab.title = Korean (JOHAB)
-iso-2022-kr.title = Korean (ISO-2022-KR)
 utf-7.title = Unicode (UTF-7)
 utf-8.title = Unicode (UTF-8)
 utf-16.title = Unicode (UTF-16)
 utf-16le.title = Unicode (UTF-16LE)
 utf-16be.title = Unicode (UTF-16BE)
 iso-8859-5.title = Cyrillic (ISO-8859-5)
 iso-ir-111.title = Cyrillic (ISO-IR-111)
 windows-1251.title = Cyrillic (Windows-1251)