--- a/mail/locales/en-US/chrome/messenger/charsetTitles.properties
+++ b/mail/locales/en-US/chrome/messenger/charsetTitles.properties
@@ -54,17 +54,16 @@ koi8-u.title = Cyrillic/Ukrainian (KOI8-
 iso-8859-7.title = Greek (ISO-8859-7)
 windows-1253.title = Greek (Windows-1253)
 x-mac-greek.title = Greek (MacGreek)
 windows-1258.title = Vietnamese (Windows-1258)
 x-viet-tcvn5712.title = Vietnamese (TCVN)
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
-armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
 windows-1255.title = Hebrew (Windows-1255)
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)
 gb18030.title = Chinese Simplified (GB18030)

--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -53,17 +53,16 @@ replacement.notForOutgoing              
 #      zh-CN          -> *-Hans
 #      ja             -> *-Jpan
 #      ko             -> *-Hang
 #      tr             -> *-Latn-TR
 #      he             -> *-Hebr
 #      ar             -> *-Arab
 # etc
 
-armscii-8.LangGroup                = x-armn
 big5.LangGroup                     = zh-TW
 x-x-big5.LangGroup                 = zh-TW
 big5-hkscs.LangGroup               = zh-HK
 euc-jp.LangGroup                   = ja
 euc-kr.LangGroup                   = ko
 gb2312.LangGroup                   = zh-CN
 gb18030.LangGroup                  = zh-CN
 gb18030.2000-0.LangGroup           = zh-CN

--- a/mailnews/intl/charsetalias.properties
+++ b/mailnews/intl/charsetalias.properties
@@ -34,17 +34,16 @@ x-mac-icelandic=x-mac-icelandic
 x-mac-croatian=x-mac-croatian
 x-mac-romanian=x-mac-romanian
 x-mac-hebrew=x-mac-hebrew
 x-mac-arabic=x-mac-arabic
 x-mac-farsi=x-mac-farsi
 x-mac-devanagari=x-mac-devanagari
 x-mac-gujarati=x-mac-gujarati
 x-mac-gurmukhi=x-mac-gurmukhi
-armscii-8=armscii-8
 x-viet-tcvn5712=x-viet-tcvn5712
 x-viet-vps=x-viet-vps
 iso-10646-ucs-2=UTF-16BE
 x-iso-10646-ucs-2-be=UTF-16BE
 x-iso-10646-ucs-2-le=UTF-16LE
 x-johab=x-johab
 
 # Aliases for ISO-8859-1

--- a/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
+++ b/suite/locales/en-US/chrome/mailnews/charsetTitles.properties
@@ -54,17 +54,16 @@ koi8-u.title = Cyrillic/Ukrainian (KOI8-
 iso-8859-7.title = Greek (ISO-8859-7)
 windows-1253.title = Greek (Windows-1253)
 x-mac-greek.title = Greek (MacGreek)
 windows-1258.title = Vietnamese (Windows-1258)
 x-viet-tcvn5712.title = Vietnamese (TCVN)
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
 windows-874.title = Thai (Windows-874)
-armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-8.title = Hebrew Visual (ISO-8859-8)
 iso-8859-8-i.title = Hebrew (ISO-8859-8-I)
 windows-1255.title = Hebrew (Windows-1255)
 windows-1256.title = Arabic (Windows-1256)
 x-user-defined.title = User Defined
 ibm866.title = Cyrillic/Russian (CP-866)
 gb18030.title = Chinese Simplified (GB18030)