Don't use charset aliases for destination charset - fixes e.g.

converting to US-ASCII

Conflicts:

	program/include/rcube_charset.php

1 files changed, 2 insertions, 2 deletions

diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index fc1685d28..2c8d3a0dd 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -89,7 +89,7 @@ class rcube_charset
      * Sometimes charset string is malformed, there are also charset aliases 
      * but we need strict names for charset conversion (specially utf8 class)
      *
-     * @param  string Input charset name
+     * @param string $input Input charset name
      *
      * @return string The validated charset name
      */
@@ -182,7 +182,7 @@ class rcube_charset
         static $mbstring_list   = null;
         static $conv            = null;
 
-        $to   = empty($to) ? strtoupper(RCMAIL_CHARSET) : self::parse($to);
+        $to   = empty($to) ? strtoupper(RCMAIL_CHARSET) : $to;
         $from = self::parse($from);
 
         // It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)