- Fix: rcube_user::get_username() doesn't take mail_domain setting into account (#1486895)

program/include/rcube_user.php

@@ -74,9 +74,11 @@ class rcube_user
             if ($part == 'local') {
                 return $local;
             }
-            // if no domain was provided use the default if available
+            // if no domain was provided...
-            if (empty($domain))
+            if (empty($domain)) {
-                $domain = $this->data['mail_host'];
+                $rcmail = rcmail::get_instance();
+                $domain = $rcmail->config->mail_domain($this->data['mail_host']);
+            }
 
             if ($part == 'domain') {
                 return $domain;