1 files changed, 6 insertions, 2 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 36892c0e1..8020c3912 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -274,10 +274,11 @@ class rcube_config
     /**
      * Return the mail domain configured for the given host
      *
-     * @param string IMAP host
+     * @param string  IMAP host
+     * @param boolean If true, domain name will be converted to IDN ASCII
      * @return string Resolved SMTP host
      */
-    public function mail_domain($host)
+    public function mail_domain($host, $encode=true)
     {
         $domain = $host;
 
@@ -288,6 +289,9 @@ class rcube_config
         else if (!empty($this->prop['mail_domain']))
             $domain = rcube_parse_host($this->prop['mail_domain']);
 
+        if ($encode)
+            $domain = idn_to_ascii($domain);
+
         return $domain;
     }