X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fi18n.php;h=5f94e0a70d78ed93ce0d1f2c1e6043ff2568647d;hp=d7b468092318de95c8018b9100f75c0227d7e3a7;hb=5f2d92d076a51da1241a0032e0365b019ad4d94e;hpb=ceac7a2fb0b1d5bc6b5f9a60060202dd8ec90c42

diff --git a/functions/i18n.php b/functions/i18n.php
index d7b46809..5f94e0a7 100644
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -12,66 +12,112 @@
  ** $Id$
  **/
 
-   $i18n_php = true;
+   if (defined ('i18n_php'))
+      return; 
+   define ('i18n_php', true);
+
+   global $squirrelmail_language, $languages;
    if (! isset($squirrelmail_language)) { $squirrelmail_language = ''; }
 
    // This array specifies the available languages.
-   $languages['en']['NAME']    = 'English';
-   $languages['en']['CHARSET'] = 'iso-8859-1';
-   
    $languages['ca']['NAME']    = 'Catalan';
    $languages['ca']['CHARSET'] = 'iso-8859-1';
+   $languages['ca_CA']['ALIAS'] = 'ca';
 
    $languages['cs_CZ']['NAME']    = 'Czech';
    $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
    
    $languages['da']['NAME']    = 'Danish';
    $languages['da']['CHARSET'] = 'iso-8859-1';
+   $languages['da_DA']['ALIAS'] = 'da';
    
    $languages['de']['NAME']    = 'Deutsch';
    $languages['de']['CHARSET'] = 'iso-8859-1';
+   $languages['de_DE']['ALIAS'] = 'de';
    
-   $languages['nl']['NAME']    = 'Dutch';
-   $languages['nl']['CHARSET'] = 'iso-8859-1';
+   $languages['en']['NAME']    = 'English';
+   $languages['en']['CHARSET'] = 'iso-8859-1';
+   $languages['en_EN']['ALIAS'] = 'en';
    
+   $languages['es']['NAME']    = 'Spanish';
+   $languages['es']['CHARSET'] = 'iso-8859-1';
+   $languages['es_ES']['ALIAS'] = 'es';
+
+   $languages['et']['NAME']    = 'Estonian';
+   $languages['et']['CHARSET'] = 'iso-8859-15';
+   $languages['et_EE']['ALIAS'] = 'et';
+
+   $languages['fi']['NAME']    = 'Finnish';
+   $languages['fi']['CHARSET'] = 'iso-8859-1';
+   $languages['fi_FI']['ALIAS'] = 'fi';
+
    $languages['fr']['NAME']    = 'French';
    $languages['fr']['CHARSET'] = 'iso-8859-1';
+   $languages['fr_FR']['ALIAS'] = 'fr';
    
-   $languages['fi']['NAME']    = 'Finnish';
-   $languages['fi']['CHARSET'] = 'iso-8859-1';
+   $languages['hr']['NAME']    = 'Croatian';
+   $languages['hr']['CHARSET'] = 'iso-8859-2';
+   $languages['hr_HR']['ALIAS'] = 'hr';
 
+   $languages['hu']['NAME']    = 'Hungarian';
+   $languages['hu']['CHARSET'] = 'iso-8859-2';
+   $languages['hu_HU']['ALIAS'] = 'hu';
+
+   $languages['id']['NAME']    = 'Indonesian';
+   $languages['id']['CHARSET'] = 'iso-8859-1';
+   $languages['id_ID']['ALIAS'] = 'id';
+   
+   $languages['is']['NAME']    = 'Icelandic';
+   $languages['is']['CHARSET'] = 'iso-8859-1';
+   $languages['is_IS']['ALIAS'] = 'is';
+   
    $languages['it']['NAME']    = 'Italian';
    $languages['it']['CHARSET'] = 'iso-8859-1';
+   $languages['it_IT']['ALIAS'] = 'it';
   
    $languages['ko']['NAME']    = 'Korean';
    $languages['ko']['CHARSET'] = 'euc-KR';
+   $languages['ko_KO']['ALIAS'] = 'ko';
+   
+   $languages['nl']['NAME']    = 'Dutch';
+   $languages['nl']['CHARSET'] = 'iso-8859-1';
+   $languages['nl_NL']['ALIAS'] = 'nl';
    
    $languages['no']['NAME']    = 'Norwegian (Bokmål)';
    $languages['no']['CHARSET'] = 'iso-8859-1';
-   
+   $languages['no_NO']['ALIAS'] = 'no';
    $languages['no_NO_ny']['NAME']    = 'Norwegian (Nynorsk)';
    $languages['no_NO_ny']['CHARSET'] = 'iso-8859-1';
    
    $languages['pl']['NAME']    = 'Polish';
    $languages['pl']['CHARSET'] = 'iso-8859-2';
+   $languages['pl_PL']['ALIAS'] = 'pl';
    
+   $languages['pt']['NAME'] = 'Português (Portugal)';
+   $languages['pt']['CHARSET'] = 'iso-8859-1';
    $languages['pt_BR']['NAME']    = 'Portuguese (Brazil)';
    $languages['pt_BR']['CHARSET'] = 'iso-8859-1';
+   $languages['pt_PT']['ALIAS'] = 'pt';
    
    $languages['ru']['NAME']    = 'Russian KOI8-R';
    $languages['ru']['CHARSET'] = 'koi8-r';
+   $languages['ru_RU']['ALIAS'] = 'ru';
    
    $languages['sr']['NAME']    = 'Serbian';
    $languages['sr']['CHARSET'] = 'iso-8859-2';
+   $languages['sr_SR']['ALIAS'] = 'sr';
    
-   $languages['es']['NAME']    = 'Spanish';
-   $languages['es']['CHARSET'] = 'iso-8859-1';
-
    $languages['sv']['NAME']    = 'Swedish';
    $languages['sv']['CHARSET'] = 'iso-8859-1';
+   $languages['sv_SV']['ALIAS'] = 'sv';
+   
+   $languages['tr']['NAME']    = 'Turkish';
+   $languages['tr']['CHARSET'] = 'iso-8859-1';
+   $languages['tr_TR']['ALIAS'] = 'tr';
    
    $languages['tw']['NAME']    = 'Taiwan';
    $languages['tw']['CHARSET'] = 'big5';
+   $languages['tw_TW']['ALIAS'] = 'tw';
    
 
    // Decodes a string to the internal encoding from the given charset
@@ -100,6 +146,8 @@
          return charset_decode_ns_4551_1 ($string);
       } else if ($charset == 'koi8-r') {
         return charset_decode_koi8r ($string);
+      } else if ($charset == 'windows-1251') {
+        return charset_decode_koi8r ($string);
       } else
          return $string;
    }
@@ -251,205 +299,206 @@
    function charset_decode_iso_8859_2 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == 'iso-8859-2') {
+      if (strtolower($default_charset) == 'iso-8859-2')
          return $string;
-      } else {
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // NO-BREAK SPACE
-            $string = str_replace("\240", ' ', $string);
-            // LATIN CAPITAL LETTER A WITH OGONEK
-            $string = str_replace("\241", 'Ą', $string);
-            // BREVE
-            $string = str_replace("\242", '˘', $string);
-            // LATIN CAPITAL LETTER L WITH STROKE
-            $string = str_replace("\243", 'Ł', $string);
-            // CURRENCY SIGN
-            $string = str_replace("\244", '¤', $string);
-            // LATIN CAPITAL LETTER L WITH CARON
-            $string = str_replace("\245", 'Ľ', $string);
-            // LATIN CAPITAL LETTER S WITH ACUTE
-            $string = str_replace("\246", 'Ś', $string);
-            // SECTION SIGN
-            $string = str_replace("\247", '§', $string);
-            // DIAERESIS
-            $string = str_replace("\250", '¨', $string);
-            // LATIN CAPITAL LETTER S WITH CARON
-            $string = str_replace("\251", 'Š', $string);
-            // LATIN CAPITAL LETTER S WITH CEDILLA
-            $string = str_replace("\252", 'Ş', $string);
-            // LATIN CAPITAL LETTER T WITH CARON
-            $string = str_replace("\253", 'Ť', $string);
-            // LATIN CAPITAL LETTER Z WITH ACUTE
-            $string = str_replace("\254", 'Ź', $string);
-            // SOFT HYPHEN
-            $string = str_replace("\255", '­', $string);
-            // LATIN CAPITAL LETTER Z WITH CARON
-            $string = str_replace("\256", 'Ž', $string);
-            // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\257", 'Ż', $string);
-            // DEGREE SIGN
-            $string = str_replace("\260", '°', $string);
-            // LATIN SMALL LETTER A WITH OGONEK
-            $string = str_replace("\261", 'ą', $string);
-            // OGONEK
-            $string = str_replace("\262", '˛', $string);
-            // LATIN SMALL LETTER L WITH STROKE
-            $string = str_replace("\263", 'ł', $string);
-            // ACUTE ACCENT
-            $string = str_replace("\264", '´', $string);
-            // LATIN SMALL LETTER L WITH CARON
-            $string = str_replace("\265", 'ľ', $string);
-            // LATIN SMALL LETTER S WITH ACUTE
-            $string = str_replace("\266", 'ś', $string);
-            // CARON
-            $string = str_replace("\267", 'ˇ', $string);
-            // CEDILLA
-            $string = str_replace("\270", '¸', $string);
-            // LATIN SMALL LETTER S WITH CARON
-            $string = str_replace("\271", 'š', $string);
-            // LATIN SMALL LETTER S WITH CEDILLA
-            $string = str_replace("\272", 'ş', $string);
-            // LATIN SMALL LETTER T WITH CARON
-            $string = str_replace("\273", 'ť', $string);
-            // LATIN SMALL LETTER Z WITH ACUTE
-            $string = str_replace("\274", 'ź', $string);
-            // DOUBLE ACUTE ACCENT
-            $string = str_replace("\275", '˝', $string);
-            // LATIN SMALL LETTER Z WITH CARON
-            $string = str_replace("\276", 'ž', $string);
-            // LATIN SMALL LETTER Z WITH DOT ABOVE
-            $string = str_replace("\277", 'ż', $string);
-            // LATIN CAPITAL LETTER R WITH ACUTE
-            $string = str_replace("\300", 'Ŕ', $string);
-            // LATIN CAPITAL LETTER A WITH ACUTE
-            $string = str_replace("\301", 'Á', $string);
-            // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\302", 'Â', $string);
-            // LATIN CAPITAL LETTER A WITH BREVE
-            $string = str_replace("\303", 'Ă', $string);
-            // LATIN CAPITAL LETTER A WITH DIAERESIS
-            $string = str_replace("\304", 'Ä', $string);
-            // LATIN CAPITAL LETTER L WITH ACUTE
-            $string = str_replace("\305", 'Ĺ', $string);
-            // LATIN CAPITAL LETTER C WITH ACUTE
-            $string = str_replace("\306", 'Ć', $string);
-            // LATIN CAPITAL LETTER C WITH CEDILLA
-            $string = str_replace("\307", 'Ç', $string);
-            // LATIN CAPITAL LETTER C WITH CARON
-            $string = str_replace("\310", 'Č', $string);
-            // LATIN CAPITAL LETTER E WITH ACUTE
-            $string = str_replace("\311", 'É', $string);
-            // LATIN CAPITAL LETTER E WITH OGONEK
-            $string = str_replace("\312", 'Ę', $string);
-            // LATIN CAPITAL LETTER E WITH DIAERESIS
-            $string = str_replace("\313", 'Ë', $string);
-            // LATIN CAPITAL LETTER E WITH CARON
-            $string = str_replace("\314", 'Ě', $string);
-            // LATIN CAPITAL LETTER I WITH ACUTE
-            $string = str_replace("\315", 'Í', $string);
-            // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\316", 'Î', $string);
-            // LATIN CAPITAL LETTER D WITH CARON
-            $string = str_replace("\317", 'Ď', $string);
-            // LATIN CAPITAL LETTER D WITH STROKE
-            $string = str_replace("\320", 'Đ', $string);
-            // LATIN CAPITAL LETTER N WITH ACUTE
-            $string = str_replace("\321", 'Ń', $string);
-            // LATIN CAPITAL LETTER N WITH CARON
-            $string = str_replace("\322", 'Ň', $string);
-            // LATIN CAPITAL LETTER O WITH ACUTE
-            $string = str_replace("\323", 'Ó', $string);
-            // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\324", 'Ô', $string);
-            // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\325", 'Ő', $string);
-            // LATIN CAPITAL LETTER O WITH DIAERESIS
-            $string = str_replace("\326", 'Ö', $string);
-            // MULTIPLICATION SIGN
-            $string = str_replace("\327", '×', $string);
-            // LATIN CAPITAL LETTER R WITH CARON
-            $string = str_replace("\330", 'Ř', $string);
-            // LATIN CAPITAL LETTER U WITH RING ABOVE
-            $string = str_replace("\331", 'Ů', $string);
-            // LATIN CAPITAL LETTER U WITH ACUTE
-            $string = str_replace("\332", 'Ú', $string);
-            // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\333", 'Ű', $string);
-            // LATIN CAPITAL LETTER U WITH DIAERESIS
-            $string = str_replace("\334", 'Ü', $string);
-            // LATIN CAPITAL LETTER Y WITH ACUTE
-            $string = str_replace("\335", 'Ý', $string);
-            // LATIN CAPITAL LETTER T WITH CEDILLA
-            $string = str_replace("\336", 'Ţ', $string);
-            // LATIN SMALL LETTER SHARP S
-            $string = str_replace("\337", 'ß', $string);
-            // LATIN SMALL LETTER R WITH ACUTE
-            $string = str_replace("\340", 'ŕ', $string);
-            // LATIN SMALL LETTER A WITH ACUTE
-            $string = str_replace("\341", 'á', $string);
-            // LATIN SMALL LETTER A WITH CIRCUMFLEX
-            $string = str_replace("\342", 'â', $string);
-            // LATIN SMALL LETTER A WITH BREVE
-            $string = str_replace("\343", 'ă', $string);
-            // LATIN SMALL LETTER A WITH DIAERESIS
-            $string = str_replace("\344", 'ä', $string);
-            // LATIN SMALL LETTER L WITH ACUTE
-            $string = str_replace("\345", 'ĺ', $string);
-            // LATIN SMALL LETTER C WITH ACUTE
-            $string = str_replace("\346", 'ć', $string);
-            // LATIN SMALL LETTER C WITH CEDILLA
-            $string = str_replace("\347", 'ç', $string);
-            // LATIN SMALL LETTER C WITH CARON
-            $string = str_replace("\350", 'č', $string);
-            // LATIN SMALL LETTER E WITH ACUTE
-            $string = str_replace("\351", 'é', $string);
-            // LATIN SMALL LETTER E WITH OGONEK
-            $string = str_replace("\352", 'ę', $string);
-            // LATIN SMALL LETTER E WITH DIAERESIS
-            $string = str_replace("\353", 'ë', $string);
-            // LATIN SMALL LETTER E WITH CARON
-            $string = str_replace("\354", 'ě', $string);
-            // LATIN SMALL LETTER I WITH ACUTE
-            $string = str_replace("\355", 'í', $string);
-            // LATIN SMALL LETTER I WITH CIRCUMFLEX
-            $string = str_replace("\356", 'î', $string);
-            // LATIN SMALL LETTER D WITH CARON
-            $string = str_replace("\357", 'ď', $string);
-            // LATIN SMALL LETTER D WITH STROKE
-            $string = str_replace("\360", 'đ', $string);
-            // LATIN SMALL LETTER N WITH ACUTE
-            $string = str_replace("\361", 'ń', $string);
-            // LATIN SMALL LETTER N WITH CARON
-            $string = str_replace("\362", 'ň', $string);
-            // LATIN SMALL LETTER O WITH ACUTE
-            $string = str_replace("\363", 'ó', $string);
-            // LATIN SMALL LETTER O WITH CIRCUMFLEX
-            $string = str_replace("\364", 'ô', $string);
-            // LATIN SMALL LETTER O WITH DOUBLE ACUTE
-            $string = str_replace("\365", 'ő', $string);
-            // LATIN SMALL LETTER O WITH DIAERESIS
-            $string = str_replace("\366", 'ö', $string);
-            // DIVISION SIGN
-            $string = str_replace("\367", '÷', $string);
-            // LATIN SMALL LETTER R WITH CARON
-            $string = str_replace("\370", 'ř', $string);
-            // LATIN SMALL LETTER U WITH RING ABOVE
-            $string = str_replace("\371", 'ů', $string);
-            // LATIN SMALL LETTER U WITH ACUTE
-            $string = str_replace("\372", 'ú', $string);
-            // LATIN SMALL LETTER U WITH DOUBLE ACUTE
-            $string = str_replace("\373", 'ű', $string);
-            // LATIN SMALL LETTER U WITH DIAERESIS
-            $string = str_replace("\374", 'ü', $string);
-            // LATIN SMALL LETTER Y WITH ACUTE
-            $string = str_replace("\375", 'ý', $string);
-            // LATIN SMALL LETTER T WITH CEDILLA
-            $string = str_replace("\376", 'ţ', $string);
-            // DOT ABOVE
-            $string = str_replace("\377", '˙', $string);
-	 }
-      }
+     
+      // Only do the slow convert if there are 8-bit characters
+      if (! ereg("[\200-\377]", $string))
+         return $string;
+	 
+      // NO-BREAK SPACE
+      $string = str_replace("\240", ' ', $string);
+      // LATIN CAPITAL LETTER A WITH OGONEK
+      $string = str_replace("\241", 'Ą', $string);
+      // BREVE
+      $string = str_replace("\242", '˘', $string);
+      // LATIN CAPITAL LETTER L WITH STROKE
+      $string = str_replace("\243", 'Ł', $string);
+      // CURRENCY SIGN
+      $string = str_replace("\244", '¤', $string);
+      // LATIN CAPITAL LETTER L WITH CARON
+      $string = str_replace("\245", 'Ľ', $string);
+      // LATIN CAPITAL LETTER S WITH ACUTE
+      $string = str_replace("\246", 'Ś', $string);
+      // SECTION SIGN
+      $string = str_replace("\247", '§', $string);
+      // DIAERESIS
+      $string = str_replace("\250", '¨', $string);
+      // LATIN CAPITAL LETTER S WITH CARON
+      $string = str_replace("\251", 'Š', $string);
+      // LATIN CAPITAL LETTER S WITH CEDILLA
+      $string = str_replace("\252", 'Ş', $string);
+      // LATIN CAPITAL LETTER T WITH CARON
+      $string = str_replace("\253", 'Ť', $string);
+      // LATIN CAPITAL LETTER Z WITH ACUTE
+      $string = str_replace("\254", 'Ź', $string);
+      // SOFT HYPHEN
+      $string = str_replace("\255", '­', $string);
+      // LATIN CAPITAL LETTER Z WITH CARON
+      $string = str_replace("\256", 'Ž', $string);
+      // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\257", 'Ż', $string);
+      // DEGREE SIGN
+      $string = str_replace("\260", '°', $string);
+      // LATIN SMALL LETTER A WITH OGONEK
+      $string = str_replace("\261", 'ą', $string);
+      // OGONEK
+      $string = str_replace("\262", '˛', $string);
+      // LATIN SMALL LETTER L WITH STROKE
+      $string = str_replace("\263", 'ł', $string);
+      // ACUTE ACCENT
+      $string = str_replace("\264", '´', $string);
+      // LATIN SMALL LETTER L WITH CARON
+      $string = str_replace("\265", 'ľ', $string);
+      // LATIN SMALL LETTER S WITH ACUTE
+      $string = str_replace("\266", 'ś', $string);
+      // CARON
+      $string = str_replace("\267", 'ˇ', $string);
+      // CEDILLA
+      $string = str_replace("\270", '¸', $string);
+      // LATIN SMALL LETTER S WITH CARON
+      $string = str_replace("\271", 'š', $string);
+      // LATIN SMALL LETTER S WITH CEDILLA
+      $string = str_replace("\272", 'ş', $string);
+      // LATIN SMALL LETTER T WITH CARON
+      $string = str_replace("\273", 'ť', $string);
+      // LATIN SMALL LETTER Z WITH ACUTE
+      $string = str_replace("\274", 'ź', $string);
+      // DOUBLE ACUTE ACCENT
+      $string = str_replace("\275", '˝', $string);
+      // LATIN SMALL LETTER Z WITH CARON
+      $string = str_replace("\276", 'ž', $string);
+      // LATIN SMALL LETTER Z WITH DOT ABOVE
+      $string = str_replace("\277", 'ż', $string);
+      // LATIN CAPITAL LETTER R WITH ACUTE
+      $string = str_replace("\300", 'Ŕ', $string);
+      // LATIN CAPITAL LETTER A WITH ACUTE
+      $string = str_replace("\301", 'Á', $string);
+      // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\302", 'Â', $string);
+      // LATIN CAPITAL LETTER A WITH BREVE
+      $string = str_replace("\303", 'Ă', $string);
+      // LATIN CAPITAL LETTER A WITH DIAERESIS
+      $string = str_replace("\304", 'Ä', $string);
+      // LATIN CAPITAL LETTER L WITH ACUTE
+      $string = str_replace("\305", 'Ĺ', $string);
+      // LATIN CAPITAL LETTER C WITH ACUTE
+      $string = str_replace("\306", 'Ć', $string);
+      // LATIN CAPITAL LETTER C WITH CEDILLA
+      $string = str_replace("\307", 'Ç', $string);
+      // LATIN CAPITAL LETTER C WITH CARON
+      $string = str_replace("\310", 'Č', $string);
+      // LATIN CAPITAL LETTER E WITH ACUTE
+      $string = str_replace("\311", 'É', $string);
+      // LATIN CAPITAL LETTER E WITH OGONEK
+      $string = str_replace("\312", 'Ę', $string);
+      // LATIN CAPITAL LETTER E WITH DIAERESIS
+      $string = str_replace("\313", 'Ë', $string);
+      // LATIN CAPITAL LETTER E WITH CARON
+      $string = str_replace("\314", 'Ě', $string);
+      // LATIN CAPITAL LETTER I WITH ACUTE
+      $string = str_replace("\315", 'Í', $string);
+      // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\316", 'Î', $string);
+      // LATIN CAPITAL LETTER D WITH CARON
+      $string = str_replace("\317", 'Ď', $string);
+      // LATIN CAPITAL LETTER D WITH STROKE
+      $string = str_replace("\320", 'Đ', $string);
+      // LATIN CAPITAL LETTER N WITH ACUTE
+      $string = str_replace("\321", 'Ń', $string);
+      // LATIN CAPITAL LETTER N WITH CARON
+      $string = str_replace("\322", 'Ň', $string);
+      // LATIN CAPITAL LETTER O WITH ACUTE
+      $string = str_replace("\323", 'Ó', $string);
+      // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\324", 'Ô', $string);
+      // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\325", 'Ő', $string);
+      // LATIN CAPITAL LETTER O WITH DIAERESIS
+      $string = str_replace("\326", 'Ö', $string);
+      // MULTIPLICATION SIGN
+      $string = str_replace("\327", '×', $string);
+      // LATIN CAPITAL LETTER R WITH CARON
+      $string = str_replace("\330", 'Ř', $string);
+      // LATIN CAPITAL LETTER U WITH RING ABOVE
+      $string = str_replace("\331", 'Ů', $string);
+      // LATIN CAPITAL LETTER U WITH ACUTE
+      $string = str_replace("\332", 'Ú', $string);
+      // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\333", 'Ű', $string);
+      // LATIN CAPITAL LETTER U WITH DIAERESIS
+      $string = str_replace("\334", 'Ü', $string);
+      // LATIN CAPITAL LETTER Y WITH ACUTE
+      $string = str_replace("\335", 'Ý', $string);
+      // LATIN CAPITAL LETTER T WITH CEDILLA
+      $string = str_replace("\336", 'Ţ', $string);
+      // LATIN SMALL LETTER SHARP S
+      $string = str_replace("\337", 'ß', $string);
+      // LATIN SMALL LETTER R WITH ACUTE
+      $string = str_replace("\340", 'ŕ', $string);
+      // LATIN SMALL LETTER A WITH ACUTE
+      $string = str_replace("\341", 'á', $string);
+      // LATIN SMALL LETTER A WITH CIRCUMFLEX
+      $string = str_replace("\342", 'â', $string);
+      // LATIN SMALL LETTER A WITH BREVE
+      $string = str_replace("\343", 'ă', $string);
+      // LATIN SMALL LETTER A WITH DIAERESIS
+      $string = str_replace("\344", 'ä', $string);
+      // LATIN SMALL LETTER L WITH ACUTE
+      $string = str_replace("\345", 'ĺ', $string);
+      // LATIN SMALL LETTER C WITH ACUTE
+      $string = str_replace("\346", 'ć', $string);
+      // LATIN SMALL LETTER C WITH CEDILLA
+      $string = str_replace("\347", 'ç', $string);
+      // LATIN SMALL LETTER C WITH CARON
+      $string = str_replace("\350", 'č', $string);
+      // LATIN SMALL LETTER E WITH ACUTE
+      $string = str_replace("\351", 'é', $string);
+      // LATIN SMALL LETTER E WITH OGONEK
+      $string = str_replace("\352", 'ę', $string);
+      // LATIN SMALL LETTER E WITH DIAERESIS
+      $string = str_replace("\353", 'ë', $string);
+      // LATIN SMALL LETTER E WITH CARON
+      $string = str_replace("\354", 'ě', $string);
+      // LATIN SMALL LETTER I WITH ACUTE
+      $string = str_replace("\355", 'í', $string);
+      // LATIN SMALL LETTER I WITH CIRCUMFLEX
+      $string = str_replace("\356", 'î', $string);
+      // LATIN SMALL LETTER D WITH CARON
+      $string = str_replace("\357", 'ď', $string);
+      // LATIN SMALL LETTER D WITH STROKE
+      $string = str_replace("\360", 'đ', $string);
+      // LATIN SMALL LETTER N WITH ACUTE
+      $string = str_replace("\361", 'ń', $string);
+      // LATIN SMALL LETTER N WITH CARON
+      $string = str_replace("\362", 'ň', $string);
+      // LATIN SMALL LETTER O WITH ACUTE
+      $string = str_replace("\363", 'ó', $string);
+      // LATIN SMALL LETTER O WITH CIRCUMFLEX
+      $string = str_replace("\364", 'ô', $string);
+      // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+      $string = str_replace("\365", 'ő', $string);
+      // LATIN SMALL LETTER O WITH DIAERESIS
+      $string = str_replace("\366", 'ö', $string);
+      // DIVISION SIGN
+      $string = str_replace("\367", '÷', $string);
+      // LATIN SMALL LETTER R WITH CARON
+      $string = str_replace("\370", 'ř', $string);
+      // LATIN SMALL LETTER U WITH RING ABOVE
+      $string = str_replace("\371", 'ů', $string);
+      // LATIN SMALL LETTER U WITH ACUTE
+      $string = str_replace("\372", 'ú', $string);
+      // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+      $string = str_replace("\373", 'ű', $string);
+      // LATIN SMALL LETTER U WITH DIAERESIS
+      $string = str_replace("\374", 'ü', $string);
+      // LATIN SMALL LETTER Y WITH ACUTE
+      $string = str_replace("\375", 'ý', $string);
+      // LATIN SMALL LETTER T WITH CEDILLA
+      $string = str_replace("\376", 'ţ', $string);
+      // DOT ABOVE
+      $string = str_replace("\377", '˙', $string);
+
       return $string;
    }
 
@@ -457,59 +506,59 @@
    function charset_decode_iso_8859_7 ($string) {
       global $default_charset;
 
-      if (strtolower($default_charset) == 'iso-8859-7') {
+      if (strtolower($default_charset) == 'iso-8859-7')
          return $string;
-      } else { 
-         // Only do the slow convert if there are 8-bit characters
-         if (ereg("[\200-\377]", $string)) {
-            // Some diverse characters in the beginning
-            $string = str_replace("\240", ' ', $string);
-            $string = str_replace("\241", '‘', $string);
-            $string = str_replace("\242", '’', $string);
-            $string = str_replace("\243", '£', $string);
-            $string = str_replace("\246", '¦', $string);
-            $string = str_replace("\247", '§', $string);
-            $string = str_replace("\250", '¨', $string);
-            $string = str_replace("\251", '©', $string);
-            $string = str_replace("\253", '«', $string);
-            $string = str_replace("\254", '¬', $string);
-            $string = str_replace("\255", '­', $string);
-            $string = str_replace("\257", '―', $string);
-            $string = str_replace("\260", '°', $string);
-            $string = str_replace("\261", '±', $string);
-            $string = str_replace("\262", '²', $string);
-            $string = str_replace("\263", '³', $string);
-         
-            // Horizontal bar (parentheki pavla)
-            $string = str_replace ("\257", '―', $string);
-         
-            // ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
-            // These are Unicode 900-902
-            while (ereg("([\264-\266])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ';';
-               $string = str_replace($res[1], $replace, $string);
-            }
-         
-            // 11/07 (0xB7) Middle dot is the same in iso-8859-1
-            $string = str_replace("\267", '·', $string);
+	 
+      // Only do the slow convert if there are 8-bit characters
+      if (!ereg("[\200-\377]", $string))
+         return $string;
+	 
+      // Some diverse characters in the beginning
+      $string = str_replace("\240", ' ', $string);
+      $string = str_replace("\241", '‘', $string);
+      $string = str_replace("\242", '’', $string);
+      $string = str_replace("\243", '£', $string);
+      $string = str_replace("\246", '¦', $string);
+      $string = str_replace("\247", '§', $string);
+      $string = str_replace("\250", '¨', $string);
+      $string = str_replace("\251", '©', $string);
+      $string = str_replace("\253", '«', $string);
+      $string = str_replace("\254", '¬', $string);
+      $string = str_replace("\255", '­', $string);
+      $string = str_replace("\257", '―', $string);
+      $string = str_replace("\260", '°', $string);
+      $string = str_replace("\261", '±', $string);
+      $string = str_replace("\262", '²', $string);
+      $string = str_replace("\263", '³', $string);
+      
+      // Horizontal bar (parentheki pavla)
+      $string = str_replace ("\257", '―', $string);
+      
+      // ISO-8859-7 characters from 11/04 (0xB4) to 11/06 (0xB6)
+      // These are Unicode 900-902
+      while (ereg("([\264-\266])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ';';
+         $string = str_replace($res[1], $replace, $string);
+      }
          
-            // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
-            // These are Unicode 900-902
-            while (ereg("([\270-\272])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ";";
-               $string = str_replace($res[1], $replace, $string);
-            }
+      // 11/07 (0xB7) Middle dot is the same in iso-8859-1
+      $string = str_replace("\267", '·', $string);
+      
+      // ISO-8859-7 characters from 11/08 (0xB8) to 11/10 (0xBA)
+      // These are Unicode 900-902
+      while (ereg("([\270-\272])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ";";
+	 $string = str_replace($res[1], $replace, $string);
+      }
          
-            // 11/11 (0xBB) Right angle quotation mark is the same as in
-            // iso-8859-1
-            $string = str_replace("\273", '»', $string);
+      // 11/11 (0xBB) Right angle quotation mark is the same as in
+      // iso-8859-1
+      $string = str_replace("\273", '»', $string);
          
-            // And now the rest of the charset
-            while (ereg("([\274-\376])", $string, $res)) {
-               $replace = '&#' . (ord($res[1])+720) . ';';
-               $string = str_replace($res[1], $replace, $string);
-            }
-         }
+      // And now the rest of the charset
+      while (ereg("([\274-\376])", $string, $res)) {
+         $replace = '&#' . (ord($res[1])+720) . ';';
+	 $string = str_replace($res[1], $replace, $string);
       }
 
       return $string;
@@ -582,166 +631,170 @@
    function charset_decode_koi8r ($string) {
       global $default_charset;
 
-      if ($default_charset == 'koi8-r') {
-         return $string;
-      } else { 
-         // Convert to Unicode HTML entities.
-         // This code is rather ineffective.
-         $string = str_replace("\200", '─', $string);
-         $string = str_replace("\201", '│', $string);
-         $string = str_replace("\202", '┌', $string);
-         $string = str_replace("\203", '┐', $string);
-         $string = str_replace("\204", '└', $string);
-         $string = str_replace("\205", '┘', $string);
-         $string = str_replace("\206", '├', $string);
-         $string = str_replace("\207", '┤', $string);
-         $string = str_replace("\210", '┬', $string);
-         $string = str_replace("\211", '┴', $string);
-         $string = str_replace("\212", '┼', $string);
-         $string = str_replace("\213", '▀', $string);
-         $string = str_replace("\214", '▄', $string);
-         $string = str_replace("\215", '█', $string);
-         $string = str_replace("\216", '▌', $string);
-         $string = str_replace("\217", '▐', $string);
-         $string = str_replace("\220", '░', $string);
-         $string = str_replace("\221", '▒', $string);
-         $string = str_replace("\222", '▓', $string);
-         $string = str_replace("\223", '⌠', $string);
-         $string = str_replace("\224", '■', $string);
-         $string = str_replace("\225", '∙', $string);
-         $string = str_replace("\226", '√', $string);
-         $string = str_replace("\227", '≈', $string);
-         $string = str_replace("\230", '≤', $string);
-         $string = str_replace("\231", '≥', $string);
-         $string = str_replace("\232", ' ', $string);
-         $string = str_replace("\233", '⌡', $string);
-         $string = str_replace("\234", '°', $string);
-         $string = str_replace("\235", '²', $string);
-         $string = str_replace("\236", '·', $string);
-         $string = str_replace("\237", '÷', $string);
-         $string = str_replace("\240", '═', $string);
-         $string = str_replace("\241", '║', $string);
-         $string = str_replace("\242", '╒', $string);
-         $string = str_replace("\243", 'ё', $string);
-         $string = str_replace("\244", '╓', $string);
-         $string = str_replace("\245", '╔', $string);
-         $string = str_replace("\246", '╕', $string);
-         $string = str_replace("\247", '╖', $string);
-         $string = str_replace("\250", '╗', $string);
-         $string = str_replace("\251", '╘', $string);
-         $string = str_replace("\252", '╙', $string);
-         $string = str_replace("\253", '╚', $string);
-         $string = str_replace("\254", '╛', $string);
-         $string = str_replace("\255", '╜', $string);
-         $string = str_replace("\256", '╝', $string);
-         $string = str_replace("\257", '╞', $string);
-         $string = str_replace("\260", '╟', $string);
-         $string = str_replace("\261", '╠', $string);
-         $string = str_replace("\262", '╡', $string);
-         $string = str_replace("\263", 'Ё', $string);
-         $string = str_replace("\264", '╢', $string);
-         $string = str_replace("\265", '╣', $string);
-         $string = str_replace("\266", '╤', $string);
-         $string = str_replace("\267", '╥', $string);
-         $string = str_replace("\270", '╦', $string);
-         $string = str_replace("\271", '╧', $string);
-         $string = str_replace("\272", '╨', $string);
-         $string = str_replace("\273", '╩', $string);
-         $string = str_replace("\274", '╪', $string);
-         $string = str_replace("\275", '╫', $string);
-         $string = str_replace("\276", '╬', $string);
-         $string = str_replace("\277", '©', $string);
-         $string = str_replace("\300", 'ю', $string);
-         $string = str_replace("\301", 'а', $string);
-         $string = str_replace("\302", 'б', $string);
-         $string = str_replace("\303", 'ц', $string);
-         $string = str_replace("\304", 'д', $string);
-         $string = str_replace("\305", 'е', $string);
-         $string = str_replace("\306", 'ф', $string);
-         $string = str_replace("\307", 'г', $string);
-         $string = str_replace("\310", 'х', $string);
-         $string = str_replace("\311", 'и', $string);
-         $string = str_replace("\312", 'й', $string);
-         $string = str_replace("\313", 'к', $string);
-         $string = str_replace("\314", 'л', $string);
-         $string = str_replace("\315", 'м', $string);
-         $string = str_replace("\316", 'н', $string);
-         $string = str_replace("\317", 'о', $string);
-         $string = str_replace("\320", 'п', $string);
-         $string = str_replace("\321", 'я', $string);
-         $string = str_replace("\322", 'р', $string);
-         $string = str_replace("\323", 'с', $string);
-         $string = str_replace("\324", 'т', $string);
-         $string = str_replace("\325", 'у', $string);
-         $string = str_replace("\326", 'ж', $string);
-         $string = str_replace("\327", 'в', $string);
-         $string = str_replace("\330", 'ь', $string);
-         $string = str_replace("\331", 'ы', $string);
-         $string = str_replace("\332", 'з', $string);
-         $string = str_replace("\333", 'ш', $string);
-         $string = str_replace("\334", 'э', $string);
-         $string = str_replace("\335", 'щ', $string);
-         $string = str_replace("\336", 'ч', $string);
-         $string = str_replace("\337", 'ъ', $string);
-         $string = str_replace("\340", 'Ю', $string);
-         $string = str_replace("\341", 'А', $string);
-         $string = str_replace("\342", 'Б', $string);
-         $string = str_replace("\343", 'Ц', $string);
-         $string = str_replace("\344", 'Д', $string);
-         $string = str_replace("\345", 'Е', $string);
-         $string = str_replace("\346", 'Ф', $string);
-         $string = str_replace("\347", 'Г', $string);
-         $string = str_replace("\350", 'Х', $string);
-         $string = str_replace("\351", 'И', $string);
-         $string = str_replace("\352", 'Й', $string);
-         $string = str_replace("\353", 'К', $string);
-         $string = str_replace("\354", 'Л', $string);
-         $string = str_replace("\355", 'М', $string);
-         $string = str_replace("\356", 'Н', $string);
-         $string = str_replace("\357", 'О', $string);
-         $string = str_replace("\360", 'П', $string);
-         $string = str_replace("\361", 'Я', $string);
-         $string = str_replace("\362", 'Р', $string);
-         $string = str_replace("\363", 'С', $string);
-         $string = str_replace("\364", 'Т', $string);
-         $string = str_replace("\365", 'У', $string);
-         $string = str_replace("\366", 'Ж', $string);
-         $string = str_replace("\367", 'В', $string);
-         $string = str_replace("\370", 'Ь', $string);
-         $string = str_replace("\371", 'Ы', $string);
-         $string = str_replace("\372", 'З', $string);
-         $string = str_replace("\373", 'Ш', $string);
-         $string = str_replace("\374", 'Э', $string);
-         $string = str_replace("\375", 'Щ', $string);
-         $string = str_replace("\376", 'Ч', $string);
-         $string = str_replace("\377", 'Ъ', $string);
-
+      if ($default_charset == 'koi8-r')
          return $string;
-      }
+	 
+      // Convert to Unicode HTML entities.
+      // This code is rather ineffective.
+      $string = str_replace("\200", '─', $string);
+      $string = str_replace("\201", '│', $string);
+      $string = str_replace("\202", '┌', $string);
+      $string = str_replace("\203", '┐', $string);
+      $string = str_replace("\204", '└', $string);
+      $string = str_replace("\205", '┘', $string);
+      $string = str_replace("\206", '├', $string);
+      $string = str_replace("\207", '┤', $string);
+      $string = str_replace("\210", '┬', $string);
+      $string = str_replace("\211", '┴', $string);
+      $string = str_replace("\212", '┼', $string);
+      $string = str_replace("\213", '▀', $string);
+      $string = str_replace("\214", '▄', $string);
+      $string = str_replace("\215", '█', $string);
+      $string = str_replace("\216", '▌', $string);
+      $string = str_replace("\217", '▐', $string);
+      $string = str_replace("\220", '░', $string);
+      $string = str_replace("\221", '▒', $string);
+      $string = str_replace("\222", '▓', $string);
+      $string = str_replace("\223", '⌠', $string);
+      $string = str_replace("\224", '■', $string);
+      $string = str_replace("\225", '∙', $string);
+      $string = str_replace("\226", '√', $string);
+      $string = str_replace("\227", '≈', $string);
+      $string = str_replace("\230", '≤', $string);
+      $string = str_replace("\231", '≥', $string);
+      $string = str_replace("\232", ' ', $string);
+      $string = str_replace("\233", '⌡', $string);
+      $string = str_replace("\234", '°', $string);
+      $string = str_replace("\235", '²', $string);
+      $string = str_replace("\236", '·', $string);
+      $string = str_replace("\237", '÷', $string);
+      $string = str_replace("\240", '═', $string);
+      $string = str_replace("\241", '║', $string);
+      $string = str_replace("\242", '╒', $string);
+      $string = str_replace("\243", 'ё', $string);
+      $string = str_replace("\244", '╓', $string);
+      $string = str_replace("\245", '╔', $string);
+      $string = str_replace("\246", '╕', $string);
+      $string = str_replace("\247", '╖', $string);
+      $string = str_replace("\250", '╗', $string);
+      $string = str_replace("\251", '╘', $string);
+      $string = str_replace("\252", '╙', $string);
+      $string = str_replace("\253", '╚', $string);
+      $string = str_replace("\254", '╛', $string);
+      $string = str_replace("\255", '╜', $string);
+      $string = str_replace("\256", '╝', $string);
+      $string = str_replace("\257", '╞', $string);
+      $string = str_replace("\260", '╟', $string);
+      $string = str_replace("\261", '╠', $string);
+      $string = str_replace("\262", '╡', $string);
+      $string = str_replace("\263", 'Ё', $string);
+      $string = str_replace("\264", '╢', $string);
+      $string = str_replace("\265", '╣', $string);
+      $string = str_replace("\266", '╤', $string);
+      $string = str_replace("\267", '╥', $string);
+      $string = str_replace("\270", '╦', $string);
+      $string = str_replace("\271", '╧', $string);
+      $string = str_replace("\272", '╨', $string);
+      $string = str_replace("\273", '╩', $string);
+      $string = str_replace("\274", '╪', $string);
+      $string = str_replace("\275", '╫', $string);
+      $string = str_replace("\276", '╬', $string);
+      $string = str_replace("\277", '©', $string);
+      $string = str_replace("\300", 'ю', $string);
+      $string = str_replace("\301", 'а', $string);
+      $string = str_replace("\302", 'б', $string);
+      $string = str_replace("\303", 'ц', $string);
+      $string = str_replace("\304", 'д', $string);
+      $string = str_replace("\305", 'е', $string);
+      $string = str_replace("\306", 'ф', $string);
+      $string = str_replace("\307", 'г', $string);
+      $string = str_replace("\310", 'х', $string);
+      $string = str_replace("\311", 'и', $string);
+      $string = str_replace("\312", 'й', $string);
+      $string = str_replace("\313", 'к', $string);
+      $string = str_replace("\314", 'л', $string);
+      $string = str_replace("\315", 'м', $string);
+      $string = str_replace("\316", 'н', $string);
+      $string = str_replace("\317", 'о', $string);
+      $string = str_replace("\320", 'п', $string);
+      $string = str_replace("\321", 'я', $string);
+      $string = str_replace("\322", 'р', $string);
+      $string = str_replace("\323", 'с', $string);
+      $string = str_replace("\324", 'т', $string);
+      $string = str_replace("\325", 'у', $string);
+      $string = str_replace("\326", 'ж', $string);
+      $string = str_replace("\327", 'в', $string);
+      $string = str_replace("\330", 'ь', $string);
+      $string = str_replace("\331", 'ы', $string);
+      $string = str_replace("\332", 'з', $string);
+      $string = str_replace("\333", 'ш', $string);
+      $string = str_replace("\334", 'э', $string);
+      $string = str_replace("\335", 'щ', $string);
+      $string = str_replace("\336", 'ч', $string);
+      $string = str_replace("\337", 'ъ', $string);
+      $string = str_replace("\340", 'Ю', $string);
+      $string = str_replace("\341", 'А', $string);
+      $string = str_replace("\342", 'Б', $string);
+      $string = str_replace("\343", 'Ц', $string);
+      $string = str_replace("\344", 'Д', $string);
+      $string = str_replace("\345", 'Е', $string);
+      $string = str_replace("\346", 'Ф', $string);
+      $string = str_replace("\347", 'Г', $string);
+      $string = str_replace("\350", 'Х', $string);
+      $string = str_replace("\351", 'И', $string);
+      $string = str_replace("\352", 'Й', $string);
+      $string = str_replace("\353", 'К', $string);
+      $string = str_replace("\354", 'Л', $string);
+      $string = str_replace("\355", 'М', $string);
+      $string = str_replace("\356", 'Н', $string);
+      $string = str_replace("\357", 'О', $string);
+      $string = str_replace("\360", 'П', $string);
+      $string = str_replace("\361", 'Я', $string);
+      $string = str_replace("\362", 'Р', $string);
+      $string = str_replace("\363", 'С', $string);
+      $string = str_replace("\364", 'Т', $string);
+      $string = str_replace("\365", 'У', $string);
+      $string = str_replace("\366", 'Ж', $string);
+      $string = str_replace("\367", 'В', $string);
+      $string = str_replace("\370", 'Ь', $string);
+      $string = str_replace("\371", 'Ы', $string);
+      $string = str_replace("\372", 'З', $string);
+      $string = str_replace("\373", 'Ш', $string);
+      $string = str_replace("\374", 'Э', $string);
+      $string = str_replace("\375", 'Щ', $string);
+      $string = str_replace("\376", 'Ч', $string);
+      $string = str_replace("\377", 'Ъ', $string);
+      
+      return $string;
    }
 
 
    global $use_gettext;
    
    // Detect whether gettext is installed.
-   // If it is, set the flag so we can use it.
-   if (! function_exists('_') || 
-       ! function_exists('bindtextdomain') ||
-       ! function_exists('textdomain'))
-       $use_gettext = false;
-   else
-       $use_gettext = true;
-          
-
-   // Avoid warnings/errors   
-   if (! function_exists('_')) {
-      function _($str) { return $str; };
-   }
-   if (! function_exists('bindtextdomain')) {
-      function bindtextdomain() { return; }
-   }
-   if (! function_exists('textdomain')) {
-      function textdomain() { return; }
+   $gettext_flags = 0;
+   if (function_exists('_')) $gettext_flags += 1;
+   if (function_exists('bindtextdomain')) $gettext_flags += 2;
+   if (function_exists('textdomain')) $gettext_flags += 4;
+
+   // If gettext is fully loaded, cool
+   if ($gettext_flags == 7)
+      $use_gettext = true;
+   // If we can fake gettext, try that
+   elseif ($gettext_flags == 0) {
+      $use_gettext = true;
+      include('../functions/gettext.php');
+   } else {
+      // Uh-ho.  A weird install
+      if (! $gettext_flags & 1) {
+         function _($str) { return $str; };
+      }
+      if (! $gettext_flags & 2) {
+         function bindtextdomain() { return; }
+      }
+      if (! $gettext_flags & 4) {
+         function textdomain() { return; }
+      }
    }
 
 
@@ -751,26 +804,56 @@
    function set_up_language($sm_language, $do_search = false)
    {
       static $SetupAlready = 0;
-		global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, $squirrelmail_language;
+      global $HTTP_ACCEPT_LANGUAGE, $use_gettext, $languages, 
+          $squirrelmail_language, $squirrelmail_default_language, 
+	  $sm_notAlias;
       
       if ($SetupAlready)
          return;
+
       $SetupAlready = 1;
-     
+      
+      $charset_headers_sent=false;
+      
       if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
          $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
       }
+      if (! $sm_language && isset($squirrelmail_default_language))
+         $sm_language = $squirrelmail_default_language;
+      $sm_notAlias = $sm_language;
+      while (isset($languages[$sm_notAlias]['ALIAS']))
+         $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
 
       if (isset($sm_language) && $use_gettext &&
-         $squirrelmail_language != '' &&
-	 isset($languages[$sm_language]['CHARSET'])) {
+          $squirrelmail_language != '' &&
+ 	  isset($languages[$sm_notAlias]['CHARSET'])) {
          if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
-           putenv('LC_ALL=' . $sm_language);
+           putenv('LC_ALL=' . $sm_notAlias);
          }
-         setlocale('LC_ALL', $sm_language);
+         setlocale('LC_ALL', $sm_notAlias);
          bindtextdomain('squirrelmail', '../locale/');
          textdomain('squirrelmail');
          header ('Content-Type: text/html; charset=' . $languages[$sm_language]['CHARSET']);
       }
    }
+
+   function set_my_charset(){
+     //
+     // There can be a $default_charset setting in the
+     // config.php file, but the user may have a different language
+     // selected for a user interface. This function checks the
+     // language selected by the user and tags the outgoing messages 
+     // with the appropriate charset corresponding to the language
+     // selection. This is "more right" (tm), than just stamping the 
+     // message blindly with the system-wide $default_charset.
+     //
+     global $data_dir, $username, $default_charset, $languages;
+     $my_language = getPref($data_dir, $username, "language");
+     if (!$my_language) return;
+     while (isset($languages[$my_language]['ALIAS']))
+        $my_language = $languages[$my_language]['ALIAS'];
+     $my_charset=$languages[$my_language]['CHARSET'];
+     if ($my_charset) $default_charset=$my_charset;
+   }
+
 ?>