Moved fixes to trunk

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7588 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 58fe60b5281521a2dd60a459df6152e46991a862..580c18c346a0ff8e0ec8f8885784c7bb29b732bf 100644 (file)
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -133,7 +133,7 @@ class mailMethodCyrus extends mailMethod
 
         /* Cut domain name */
         $val = preg_replace("/@.*$/","",$val);
-        $result[]=preg_replace ("/^.*".normalizePreg($folder)."/","INBOX", imap_utf7_decode ($val));
+        $result[]=preg_replace ("/^.*".normalizePreg($folder)."/","INBOX", mb_convert_encoding($val, "UTF-8", "UTF7-IMAP"));
       }
     }