- Fix: iconv doesn't support UTF7-IMAP

git-svn-id: https://svn.roundcube.net/trunk@3966 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index e3004d048..095862818 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -205,8 +205,8 @@ function rcube_charset_convert($str, $from, $to=NULL)
   if ($from == $to || empty($str) || empty($from))
     return $str;
 
-  // convert charset using iconv module  
-  if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
+  // convert charset using iconv module
+  if (function_exists('iconv') && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP') {
     if ($iconv_options === null) {
       // ignore characters not available in output charset
       $iconv_options = '//IGNORE';