- support dynamic hostname variables in 'username_domain' option

1 files changed, 2 insertions, 2 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 20b7bf7c9..d644f4f09 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -597,9 +597,9 @@ class rcmail
     // Check if we need to add domain
     if (!empty($config['username_domain']) && !strpos($username, '@')) {
       if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
-        $username .= '@'.$config['username_domain'][$host];
+        $username .= '@'.rcube_parse_host($config['username_domain'][$host]);
       else if (is_string($config['username_domain']))
-        $username .= '@'.$config['username_domain'];
+        $username .= '@'.rcube_parse_host($config['username_domain']);
     }
 
     // try to resolve email address from virtuser table