diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 55a84f642..af27851b2 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -40,6 +40,11 @@ $rcmail_config['default_host'] = '';
 // TCP port used for IMAP connections
 $rcmail_config['default_port'] = 143;
 
+// Automatically add this domain to user names for login
+// Only for IMAP servers that require full e-mail addresses for login
+// Specify an array with 'host' => 'domain' values to support multiple hosts
+$rcmail_config['username_domain'] = '';
+
 // This domain will be used to form e-mail addresses of new users
 // Specify an array with 'host' => 'domain' values to support multiple hosts
 $rcmail_config['mail_domain'] = '';
@@ -175,5 +180,11 @@ $rcmail_config['prefer_html'] = TRUE;
 // show pretty dates as standard
 $rcmail_config['prettydate'] = TRUE;
 
+
+/***** try to load host-specific configuration *****/
+
+@include($_SERVER['HTTP_HOST'].'.inc.php');
+
+
 // end of config file
 ?>
\ No newline at end of file