diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 7d1ec4381568ba79c6812a569985778030585cf3..71efb3085e18f6570e17b3b4a85288ae51620a85 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -19,3 +19,7 @@ DROP TABLE 'software_update_inst';
 
 -- Brexit
 UPDATE `country` SET `eu` = 'n' WHERE `iso` = 'GB';
+
+-- Add limit for per domain relaying
+ALTER TABLE `client` ADD `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_spamfilter_policy`;
+ALTER TABLE `client_template` ADD `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_spamfilter_policy`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 04082fbeb7d371e871c89a34072c1b6e8bcf1919..006beb6b53945de3403408dac1bfcbab8b7bb498 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -185,6 +185,7 @@ CREATE TABLE `client` (
   `limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
+  `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
   `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
   `xmpp_servers` text,
   `limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
@@ -317,6 +318,7 @@ CREATE TABLE `client_template` (
   `limit_spamfilter_wblist` int(11) NOT NULL default '0',
   `limit_spamfilter_user` int(11) NOT NULL default '0',
   `limit_spamfilter_policy` int(11) NOT NULL default '0',
+  `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
   `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
   `xmpp_servers` text,
   `limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 99ca0693f577015b819a299405585c989a69d9bc..1ac932aea392716d66bddd0d232e95a68632450a 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -8,6 +8,7 @@
 
 [mail]
 enable_custom_login=n
+show_per_domain_relay_options=n
 mailbox_show_autoresponder_tab=y
 mailbox_show_mail_filter_tab=y
 mailbox_show_custom_rules_tab=y
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 9b5ac17f1516065ff9aac11bf9dfe3e86aec891f..f66a48cb120324337a198bc014b07c281e142ad9 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -273,6 +273,11 @@ $form["tabs"]['mail'] = array (
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'show_per_domain_relay_options' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+		),
 		'mailbox_show_autoresponder_tab' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 7e0901e60094e4e983a962086deb6739735ab166..5d21ab4c2e93e8bf0fd713516481429a36d9d97c 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index 161fafd836ee70c5e4b205e7e5148554846851eb..1b8d10541d05febec539338ac21a0fc9eda0e6ae 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index de491ad9690770c9d40c02768d5d375f92217f0f..6cf3bf58bbb6ef0be3f8a84f780270eef09b8957 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -27,6 +27,7 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Link para o PHPMyAdmin';
 $wb['enable_welcome_mail_txt'] = 'Enable welcome email';
 $wb['enable_custom_login_txt'] = 'Permitir nome de usuário personalizado';
 $wb['mailboxlist_webmail_link_txt'] = 'Link para o Webmail';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Exibir aba de auto-resposta nos detalhes da conta de email';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Exibir aba de filtro de emails nos detalhes da conta de email';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Exibir aba de filtros personalizados de email nos detalhes da conta de email';
diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng
index 1a223de73e3264011fceb1a293fe9fcde1d6f225..9f9f3622884342a93ed6088ee9c4956ec9eaa782 100644
--- a/interface/web/admin/lib/lang/ca_system_config.lng
+++ b/interface/web/admin/lib/lang/ca_system_config.lng
@@ -27,6 +27,7 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
 $wb['enable_welcome_mail_txt'] = 'Enable welcome email';
 $wb['enable_custom_login_txt'] = 'Allow custom login name';
 $wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 5ff737c939a6e8e392d20eb7b4148d83e5376d6a..23dbc9c41efa0b41775599e1a73a7d1a8e939957 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -49,6 +49,7 @@ $wb['use_combobox_txt'] = 'Použití jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Použití indikátoru zatížení';
 $wb['f5_to_reload_js_txt'] = 'Pokud vypnete tuto volbu, zřejmě budete muset používat klávesu F5, aby internetový prohlížeč znovu načetl JavaScript knihovny nebo budete muset ručně vyprázdňovat mezipaměť (cache) vašeho internetového prohlížeče.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Ukázat kartu automatická odpověď v podrobnostech u poštovní schránky';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Ukázat kartu poštovní filtry v podrobnostech u poštovní schránky';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Ukázat kartu vlastní pravidla v podrobnostech u poštovní schránky';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 8c30b71a1aa1f9ba0866ce288069caf0f8aaed43..7d372a820e9a56e1ce54ca429c6c2ea28d24ca86 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -52,6 +52,7 @@ $wb['f5_to_reload_js_txt'] = 'Wenn Sie den Wert ändern, müssen Sie F5 drücken
 $wb['phpmyadmin_url_error_regex'] = 'Falsche phpMyAdmin URL';
 $wb['client_username_web_check_disabled_txt'] = 'Deaktiviere die Kunden Benutzernamen Überprüfung für den Begriff <b>web<b>.';
 $wb['backups_include_into_web_quota_txt'] = 'Backups in Web Quota hinzuzählen.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Zeige Autoresponder Reiter in E-Mail Kontodetails';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Zeige E-Mail Filter Reiter in E-Mail Kontodetails';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Zeige Benutzerregel Reiter in E-Mail Kontodetails';
diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng
index a179749ba9e921ad3f91d0a82f367aa8a4aa79f2..18160789a9d8bb83152ba44547c8ae35fe521326 100644
--- a/interface/web/admin/lib/lang/dk_system_config.lng
+++ b/interface/web/admin/lib/lang/dk_system_config.lng
@@ -49,6 +49,7 @@ $wb['use_combobox_txt'] = 'Brug jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Brug Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'Hvis du ændrer dette, kan du blive nødt til at trykke på F5 for at browseren genindlæser JavaScript-biblioteker eller tømme browserens cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Deaktiver klient-brugernavns check for ordet \'web\'.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Vis autoresponder tab i mail kontooplysninger';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Vis mail filter tab i mail kontooplysninger';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Vis custom mailfilter tab i mail kontooplysninger';
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index d7282be3af4c0d1398b07954cddb7a450d07a816..7e2df97a492f642c466fc3a0095564329f75f4e3 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Χρήση Load Indicator (ενδεικτή φό
 $wb['f5_to_reload_js_txt'] = 'Αν το αλλάξετε, ίσως πρέπει να πατήσετε το F5 για να κάνετε τον φυλλομετρητη να ξαναφορτώσει τις βιβλιοθήκες JavaScript ή να αδείασετε την cache του φυλλομετρητή.';
 $wb['client_username_web_check_disabled_txt'] = 'Απενεργοποίηση ελέγχου στο όνομα χρήστη για την λέξη \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Εμφάνιση της καρτέλας Αυτόματης Απάντησης στις λεπτομέρειες του λογαριασμού mail';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Εμφάνιση της καρτέλας Φίλτρα mail στις λεπτομέρειες του λογαριασμού mail';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Εμφάνιση της καρτέλας Προσαρμοσμένοι Κανόνες στις λεπτομέρειες του λογαριασμού mail';
diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng
index a8a553e19e152cdd1b52c8662977c5584604d116..7db4270c128013516c6135c817198d9c30257c06 100644
--- a/interface/web/admin/lib/lang/en_system_config.lng
+++ b/interface/web/admin/lib/lang/en_system_config.lng
@@ -27,9 +27,6 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
 $wb['enable_welcome_mail_txt'] = 'Enable welcome email';
 $wb['enable_custom_login_txt'] = 'Allow custom login name';
 $wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
-$wb['mailbox_show_autoresponder_tab_txt'] = 'Show Autoresponder tab in Mailbox detail';
-$wb['mailbox_show_mail_filter_tab_txt'] = 'Show Mail Filter tab in Mailbox detail';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'Show Custom Rules tab in Mailbox detail';
 $wb['webmail_url_txt'] = 'Webmail URL';
 $wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
 $wb['mailmailinglist_url_txt'] = 'Mailing list URL';
@@ -56,6 +53,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index 6534f22953c90f57d06db8c501f55d7046d5906d..92633c160114e1721e48245bcc078cc6bf7bc6c6 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -35,6 +35,7 @@ $wb['f5_to_reload_js_txt'] = 'Si modifica esto, deberá pulsar F5 para que el ex
 $wb['ftpuser_prefix_error_regex'] = 'Carácter no permitido en el prefijo de usuario de FTP.';
 $wb['ftpuser_prefix_txt'] = 'Prefijo del usuario de FTP';
 $wb['login_link_error_regex'] = 'Enlace incorrecto para el inicio de sesión personalizado';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Mostrar la pestaña del auto-respondedor en los detalles de la cuenta de correo';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Mostrar la pestaña filtro de correo personalizado en los detalles de la cuenta de correo';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Mostrar la pestaña filtro de correo en los detalles de la cuenta de correo';
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index 6932854a2d999195c47c294ca1b038067cc7d756..1a124440574379e02b7ac3a80ed90905f40ed01c 100644
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index 2cc6394dc69b90e924dc276cdd4a0647dd5913f9..a79bf9dafd7ce3b7ed37118e23cffcdd7f9dc2bf 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -49,6 +49,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word ’web’.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index 2c70c621916bb60419050c6425227bac35fe021f..7a3426eff580f77e0e1cf684913b60f5b084e61f 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index 7187d55d5874c1dbc3f50b7c3bda5e7e1a59ef0e..5fb8f7cd6e54e364cbd43b31e3f369e9bbfe8f75 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index b08d5ca60b616caf495273bfd6f4c32add9389b1..b1df781b7646c5b729a4eb6d19d1b64076e3552b 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 873ef5838bd5fceb6e13d8f4e8ced328ea7c8973..ddfc072ff2653d987596d44d76ba9949ec0621a6 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -49,6 +49,7 @@ $wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index cf36675239b605126c81f92375c3390b838f00ce..8ff20d13cade7b51fdf9d77603fe15f7e4a9c635 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index b36b12ec4beecc3ea4e8b66be6c074a5731f187a..0caa9228e08fda0e5dbb84ce29a66704ba2a9e1d 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -17,6 +17,7 @@ $wb['shelluser_prefix_error_regex'] = 'Char niet toegestaan in shell gebruiker v
 $wb['webdavuser_prefix_error_regex'] = 'Char niet toegestaan in webdav gebruiker voorvoegsel.';
 $wb['dblist_phpmyadmin_link_txt'] = 'Link naar phpmyadmin in DB lijst';
 $wb['mailboxlist_webmail_link_txt'] = 'Link naar webmail in Mailbox lijst';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 26adecad6ce4a103c10e37ee9ab66b209eda9e6d..92b167c60d8c60ba4f19082d4c49a21da2b3a085 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Użyj wskaźnika ładowania';
 $wb['f5_to_reload_js_txt'] = 'Jeżeli zmienisz to, możesz potrzebować wcisnąć F5 lub wyczyścić cache aby przeglądarka przeładowała biblioteki JavaScript.';
 $wb['client_username_web_check_disabled_txt'] = 'Wyłącz sprawdzanie nazwy klienta w poszukiwaniu słowa -web-.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Pokaż zakładkę autorespondera w szczegółach konta email.';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Pokaż zakładkę filtra email w szczegółach konta email.';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Pokaż zakładkę własnych filtrów email w szczegółach konta email.';
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 6a0fb181d9949f7bcf2d249f409e1c0f18b6a785..491aa6272c75a24b0710fb9e04ead319a9288c25 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index abf206d1af6902473091554b0eef245858826cb4..fc268d22410452399e5fc8e62a5e36243deaf951 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 3f6653ba25d598590f33c02c4239a9d9677dffbc..ae12c4b4c1682d4b63b38159635896325dafce5d 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Использовать индикатор за
 $wb['f5_to_reload_js_txt'] = 'Если вы измените это, вам, возможно, придется нажать F5, чтобы перезагрузить в браузере JavaScript-библиотеи или очистить кэш браузера.';
 $wb['client_username_web_check_disabled_txt'] = 'Отключить проверку логина клиента для слова \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Включить резервное копирование файлов в веб-квоту.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Показывать вкладку автоответчика в деталях учетной записи электронной почты';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Показывать вкладку почтового фильтра в деталях учетной записи электронной почты';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Показывать вкладку пользовательского почтового фильтра в деталях учетной записи электронной почты';
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index f581c015e7258cee227de4bc48e5527fae488863..fa302c344aa1531d3e2fc0e7863ec5823088b601 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Använd laddningsindikator';
 $wb['f5_to_reload_js_txt'] = 'Om du ändrar detta kan du behöva trycka F5 för att ladda om javascript, eller rensa din webbläsarcache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Visa autosvarsfliken vid detaljerna för epostkonto';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Visa epostfilterfliken vid detaljerna för epostkonto';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index b1004aba861cfa61fbb4e7472256f0414f598b84..6735e91c53f82691edd308d6d07b8723f1f0296c 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -52,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Use Load Indicator';
 $wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index c80179262532880c8aef27206a9ad8ebe3fc9c94..b767101e22a67448d6d91d193b70c69f02da1450 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -27,9 +27,6 @@ $wb['dblist_phpmyadmin_link_txt'] = 'Veritabanı listesinde phpMyAdmin bağlant
 $wb['enable_welcome_mail_txt'] = 'Enable welcome email';
 $wb['enable_custom_login_txt'] = 'Özel oturum açma kullanıcı adı kullanılabilsin';
 $wb['mailboxlist_webmail_link_txt'] = 'E-posta kutusu listesinde Webmail bağlantısı';
-$wb['mailbox_show_autoresponder_tab_txt'] = 'E-posta hesabı ayrıntılarında otoyanıtlayıcı sekmesi görüntülensin';
-$wb['mailbox_show_mail_filter_tab_txt'] = 'E-posta hesabı ayrıntılarında e-posta süzgeci sekmesi görüntülensin';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'E-posta hesabı ayrıntılarında isteğe bağlı e-posta süzgeci sekmesi görüntülensin';
 $wb['webmail_url_txt'] = 'Webmail Adresi';
 $wb['mailmailinglist_link_txt'] = 'E-posta Listeleri listesinde E-posta Listesi bağlantısı';
 $wb['mailmailinglist_url_txt'] = 'E-posta Listesi Adresi';
@@ -55,6 +52,7 @@ $wb['use_loadindicator_txt'] = 'Yük Göstergesi Kullanılsın';
 $wb['f5_to_reload_js_txt'] = 'Bu değer değiştirildiğinde, web tarayıcının JavaScript kitaplıklarını yeniden yüklemesi için F5 tuşuna basmalı ya da web tarayıcının ön belleğini temizlemelisiniz.';
 $wb['client_username_web_check_disabled_txt'] = 'Müşteri kullanıcı adında \'web\' sözcüğü denetimi devre dışı bırakılsın.';
 $wb['backups_include_into_web_quota_txt'] = 'Yedek dosyaları web kotasına katılsın.';
+$wb['show_per_domain_relay_options_txt'] = 'Show per domain relay options';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'E-posta hesabı ayrıntılarında otoyanıtlayıcı sekmesi görüntülensin';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'E-posta hesabı ayrıntılarında e-posta süzgeci sekmesi görüntülensin';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'E-posta hesabı ayrıntılarında isteğe bağlı e-posta süzgeci sekmesi görüntülensin';
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 4aa7ee3944c5adc20bf56a24e61addbda7a34d81..ac9271a9cf2c11854ad253d917d13fa06a6985ef 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -10,6 +10,12 @@
                     {tmpl_var name='enable_welcome_mail'}
                 </div>
             </div>
+            <div class ="form-group">
+              <label class="col-sm-3 control-label">{tmpl_var name='show_per_domain_relay_options_txt'}</label>
+              <div class="col-sm-9">
+                {tmpl_var name='show_per_domain_relay_options'}
+              </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 7ad9aecac6f262f8a558b24773860df74d71d38d..83464112d5429a9636d66f7a2c3641aea4d24b1e 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -938,6 +938,13 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_relayhost' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'valuelimit' => 'client:limit_relayhost',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
         'default_xmppserver' => array (
             'datatype' => 'INTEGER',
             'formtype' => 'SELECT',
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index 5883cce56c2dd5bc1cef98895d4421b2bd5aaa70..ea8fb7d27e777b8baf752ff79c2858b32e9e27d9 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -353,7 +353,15 @@ $form["tabs"]['limits'] = array (
 			'maxlength' => '10',
 			'rows'  => '',
 			'cols'  => ''
-		),/*
+		),
+		'limit_relayhost' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'valuelimit' => 'client:limit_relayhost',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
+		/*
         'default_xmppserver' => array (
             'datatype' => 'INTEGER',
             'formtype' => 'SELECT',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 8c94132b3b04e439cab38ce047623ceb9b1284ae..f2f88343bf665d77304ffc9de4b130dc9c559be0 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -936,6 +936,12 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_relayhost' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
         'default_xmppserver' => array (
             'datatype' => 'INTEGER',
             'formtype' => 'SELECT',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index fde7171aa2fbe7fe8edfac451d5bab496b9fe1fa..6de8fa1138b7eb5285444c7381e38ef0b97cceb3 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index fe67603b19342ceaa2508ecfab970b0f12adaf01..d1050a825128a5dfbc2987c9bd09529ed289c633 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index afd557ab1897aa649244717150888d75beec1715..4d21c7d173522f9aa06151eb20d6c6ce3fc1dee0 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index d9e5c1de617410cf64497022a0e2352b391df928..5d696dd3201485032f7caab1c71a3fdbdf0f0b42 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -38,6 +38,7 @@ $wb['title_txt'] = 'Обръщение';
 $wb['firstname_txt'] = 'Име';
 $wb['surname_txt'] = 'Фамилия';
 $wb['limit_client_txt'] = 'Макс. брой клиенти';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index 0ca56504f141eba0553c266f4fb3371f3a70bd2c..222554fbfd2aa7ede757fd463060f74e83f0cc37 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Макс. брой на spamfilter white /
 $wb['limit_spamfilter_user_txt'] = 'Макс. брой на spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. брой на spamfilter policys';
 $wb['limit_client_txt'] = 'Макс. брой на Клиентите';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index d34dff83d68405f57b95fd1dbe146b0b63b055f2..d8489b581791a7b802681b88e8e39261bfb5ce39 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Компания';
 $wb['title_txt'] = 'Обръщение';
 $wb['firstname_txt'] = 'Първо име ';
 $wb['surname_txt'] = 'Фамилия';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index 4d2928459d0b96b4dc7f60b77021e97d1fa2e5b5..f5f735a9dc055511379e4ee81a21a1cf1c00917d 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Empresa';
 $wb['title_txt'] = 'Cargo';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Sobrenome';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Limite de domínios';
 $wb['limit_subdomain_txt'] = 'Limite de subdomínios';
 $wb['limit_webquota_txt'] = 'Limite da cota de sites';
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index 3c866f48e7ce4225c6fae0df65b75ff9480fc57a..af4824fad1e5c5c402e9d25b7dde1265fbc7461b 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -19,6 +19,7 @@ $wb['limit_mailquota_txt'] = 'Cota da conta de email';
 $wb['limit_spamfilter_wblist_txt'] = 'Limite de filtros anti-spam "lista de permissões/lista de bloqueio"';
 $wb['limit_spamfilter_user_txt'] = 'Limite de filtros anti-spam para conta de email';
 $wb['limit_spamfilter_policy_txt'] = 'Limite de políticas anti-spam';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Limite de domínios';
 $wb['limit_subdomain_txt'] = 'Limite de subdomínios';
 $wb['limit_webquota_txt'] = 'Limite da cota de site';
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 9dacacda440b8d015d5abe8bd9cd98270a89a8e0..b7cc4526233771d48282f1d84129d4e9c9b07a63 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Empresa';
 $wb['title_txt'] = 'Título';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Sobrenome';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Limite de domínios';
 $wb['limit_subdomain_txt'] = 'Limite de subdomínios';
 $wb['limit_webquota_txt'] = 'Cota de sites';
diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng
index 56b6718749c208beb26a9d18391b6c35dc39ce5f..cc8276ac20e0bbfe61128df437eb83c5231f9e95 100644
--- a/interface/web/client/lib/lang/ca_client.lng
+++ b/interface/web/client/lib/lang/ca_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Titre';
 $wb['firstname_txt'] = 'Prénom';
 $wb['surname_txt'] = 'Nom';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng
index c72d067822ec448467ecd7ac35bd48d373c51e80..9328b422aa4038c9e4df98a0ebd336d1b10d57e7 100644
--- a/interface/web/client/lib/lang/ca_client_template.lng
+++ b/interface/web/client/lib/lang/ca_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\
 $wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng
index de734d385b13651568c90b4457ea7ef460d32179..6e39d6741f46edd9cdc587215a00dc2ffdd81942 100644
--- a/interface/web/client/lib/lang/ca_reseller.lng
+++ b/interface/web/client/lib/lang/ca_reseller.lng
@@ -36,6 +36,7 @@ $wb['company_txt'] = 'Entreprise';
 $wb['title_txt'] = 'Titre';
 $wb['firstname_txt'] = 'Prénom';
 $wb['surname_txt'] = 'Nom';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index c6bc86a59d756104d8440c942041d4caf640f41b..6c6bb093ad0d43cacb4151ed54ec385802b771a5 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Společnost';
 $wb['title_txt'] = 'Titul';
 $wb['firstname_txt'] = 'Jméno';
 $wb['surname_txt'] = 'Příjmení';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 812a8e2766b9285107e6e247cbab6d9145d8f45d..addc035022b3005d6f052b84e3e436c6fd80a592 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
 $wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 79888530b097e1fc669f0e3cd20dc5757cc3e669..2ae6860b32db8bfb73cbfd5fd80527e574630be2 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -36,6 +36,7 @@ $wb['company_txt'] = 'Společnost';
 $wb['title_txt'] = 'Titul';
 $wb['firstname_txt'] = 'Jméno';
 $wb['surname_txt'] = 'Příjmení';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index cce0b03b683d1f3a3b66ec45c7a2f722fe9d96bf..077e3f32658c648551640ce523ed85dd700ba31a 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Vorname';
 $wb['surname_txt'] = 'Nachname';
 $wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
 $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
 $wb['limit_webquota_txt'] = 'Max. Webbeschränkung';
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index aaf26f99966056292e1dc8c7098f1f562c4d0c94..6ca0f25579ca49362afa7ad213461fdaeae3b5dc 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Max. Anzahl an Spamfilter (White-/Blacklis
 $wb['limit_spamfilter_user_txt'] = 'Max. Anzahl Spamfilter Benutzer';
 $wb['limit_spamfilter_policy_txt'] = 'Max. Anzahl an Spamfilter Richtlinien';
 $wb['limit_client_txt'] = 'Max. Anzahl an Kunden';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
 $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
 $wb['limit_webquota_txt'] = 'Max. Speicherplatzbeschränkung';
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 5d6a8f134f6f4c499b157bb72042be7b1c0c11ef..c5536ceec955201d326dd86cac4908e3d6c1670a 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Firma';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Vorname';
 $wb['surname_txt'] = 'Nachname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Max. Anzahl an Domains';
 $wb['limit_subdomain_txt'] = 'Max. Anzahl an Subdomains';
 $wb['limit_webquota_txt'] = 'Max. Speicherplatzbeschränkung';
diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng
index fc83620acb41433374349df6298fef81bf8ec39b..aebe9a9bddc7e58dfdeb5013830d1b64a7c1eb48 100644
--- a/interface/web/client/lib/lang/dk_client.lng
+++ b/interface/web/client/lib/lang/dk_client.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Firma';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Fornavn';
 $wb['surname_txt'] = 'Efternavn';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webkvote';
diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng
index fa9399197fa0d7a411b0293afe7e35d900044ad2..64a8b30874fc0078300922f25fbeabadbb0a418e 100644
--- a/interface/web/client/lib/lang/dk_client_template.lng
+++ b/interface/web/client/lib/lang/dk_client_template.lng
@@ -18,6 +18,7 @@ $wb['limit_mailquota_txt'] = 'Postboks kvota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. antal af spamfilter white/blacklist filtere';
 $wb['limit_spamfilter_user_txt'] = 'Max. antal af spamfilter brugere';
 $wb['limit_spamfilter_policy_txt'] = 'Max. antal af spamfilter politikker';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webkvote';
diff --git a/interface/web/client/lib/lang/dk_reseller.lng b/interface/web/client/lib/lang/dk_reseller.lng
index 19babe52d47f8c51e8f5b25f1048c03db5f84815..ef37da2c8ed97d679b963763fe78848a53c861b2 100644
--- a/interface/web/client/lib/lang/dk_reseller.lng
+++ b/interface/web/client/lib/lang/dk_reseller.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Firma';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Fornavn';
 $wb['surname_txt'] = 'Efternavn';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webkvote';
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 3d61198d3debe66f04424ba4dd9c0eb9b341fc61..468c6e29af4299e05e8c79b8a3132b0f567ebcb0 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Εταιρία';
 $wb['title_txt'] = 'Τίτλος';
 $wb['firstname_txt'] = 'Όνομα';
 $wb['surname_txt'] = 'Επίθετο';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Όριο domain';
 $wb['limit_subdomain_txt'] = 'Όριο subdomain';
 $wb['limit_webquota_txt'] = 'Όριο χώρου web';
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 7d05bd4cc8b60f56f5731e5515832b7742b6665a..9b6333deaabbb313c604f6944a47fa62b122db28 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Όριο θυρίδας';
 $wb['limit_spamfilter_wblist_txt'] = 'Όριο spamfilter white / blacklist';
 $wb['limit_spamfilter_user_txt'] = 'Όριο χρηστών spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Όριο πολιτικών spamfilter';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Όριο domain';
 $wb['limit_subdomain_txt'] = 'Όριο subdomain';
 $wb['limit_webquota_txt'] = 'Όριο χώρου web';
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 9aa37a633325e3aa06846ca5a23cdf344f36cbf0..2a4ae26bdf0ccb30c982a532fd2f62854bfe36a8 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Εταιρία';
 $wb['title_txt'] = 'Τίτλος';
 $wb['firstname_txt'] = 'Όνομα';
 $wb['surname_txt'] = 'Επίθετο';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Όριο Domain';
 $wb['limit_subdomain_txt'] = 'Όριο Subdomain';
 $wb['limit_webquota_txt'] = 'Όριο Χώρου Web';
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index ee5f3675bdf42e4aadfe1cc3de5b9772aa1fb73b..0f38b60dd925382920ee7ebc8eaba20ca525880e 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index bfccedcf1e6c47184051e5337fc3e4c4cae1b841..8cb93a9966b833e13089e31f717f9bc8de9843ba 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -19,6 +19,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index c2315c67b4a35ced167b8342cf7c910fe226d922..8e09ae1b4d3cd22504291cb73476b9f8fc644488 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 645a533a51c0b1d2f54b50da62c8a9c99b226781..6fe418a1d61c1b3a73c6096c4dffa057228caf75 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -79,6 +79,7 @@ $wb['limit_dns_slave_zone_error_notint'] = 'El límite de zonas esclavas de dns
 $wb['limit_dns_slave_zone_txt'] = 'Cantidad máxima de zonas secundarias de DNS';
 $wb['limit_dns_zone_error_notint'] = 'El límite de zonas DNS debe ser un número.';
 $wb['limit_dns_zone_txt'] = 'Cantidad máxima de zonas DNS';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_fetchmail_txt'] = 'Cantidad máx. de recogedores de correo';
 $wb['limit_ftp_user_error_notint'] = 'El límite de usuarios de FTP debe ser un número.';
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index 17c73de969f1394950cd0ab851f6c074a372855c..0c2a4700fd37b64e12cf17bc5502bc1574485958 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -35,6 +35,7 @@ $wb['limit_dns_slave_zone_error_notint'] = 'El límite de zonas esclavas de dns
 $wb['limit_dns_slave_zone_txt'] = 'Cantidad máx. de zonas secundarias de DNS';
 $wb['limit_dns_zone_error_notint'] = 'El límite de zonas DNS debe ser un número.';
 $wb['limit_dns_zone_txt'] = 'Cantidad máx. de zonas DNS';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_domainmodule_txt'] = 'Límites del módulo de dominio';
 $wb['limit_fetchmail_txt'] = 'Cantidad máx. de recuperadores de correo';
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index d2553ce83c88cf13ab60a3141f3117c1f0bffba1..2d96fe2bdca5d999fd5adde2831826d1f2fcf24d 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -85,6 +85,7 @@ $wb['limit_dns_slave_zone_error_notint'] = 'El límite de zonas esclavas de dns
 $wb['limit_dns_slave_zone_txt'] = 'Cantidad máxima de zonas secundarias de DNS';
 $wb['limit_dns_zone_error_notint'] = 'El límite de zonas DNS debe ser un número.';
 $wb['limit_dns_zone_txt'] = 'Cantidad máxima de zonas DNS';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_domainmodule_error_notint'] = 'El límite del módulo de dominio debe ser un número.';
 $wb['limit_domainmodule_txt'] = 'Límites del módulo de dominio';
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index c0c0a5ba3afb8a361fc679b7ea1b579b8a9ee57c..b373a7f10fbb232b26b1179adf11d82243f9b422 100644
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Otsikko';
 $wb['firstname_txt'] = 'Etunimi';
 $wb['surname_txt'] = 'Sukunimi';
 $wb['limit_client_txt'] = 'Asiakkaiden määrä';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Verkkotunnuksien määrä';
 $wb['limit_subdomain_txt'] = 'Aliverkkotunnuksien määrä';
 $wb['limit_webquota_txt'] = 'Kotisivutila';
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index d24182806bf4e6b497c8f3a4d505b562ba6a8896..68d9c0bead2c88dabdea4ba1227638c1c8c55cf7 100644
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Roskapostisuodattimen estolistojen määr
 $wb['limit_spamfilter_user_txt'] = 'Roskapostisuodattimen käyttäjien määrä';
 $wb['limit_spamfilter_policy_txt'] = 'Roskapostisuodattimen kohtelutapojen määrä';
 $wb['limit_client_txt'] = 'Asiakkaiden määrä';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Verkkotunnuksien raja';
 $wb['limit_subdomain_txt'] = 'Aliverkkotunnuksien raja';
 $wb['limit_webquota_txt'] = 'Kotisivutilan raja';
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index 06e2ef5fcaa2d75caa71edca40ae473e19e45d21..d0e4eedcfe95c30dbb58494a5385e148988150c5 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Yritys';
 $wb['title_txt'] = 'Titteli';
 $wb['firstname_txt'] = 'Etunimi';
 $wb['surname_txt'] = 'Sukunimi';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Verkkotunnusraja';
 $wb['limit_subdomain_txt'] = 'Aliverkkotunnusraja';
 $wb['limit_webquota_txt'] = 'WWW-levytila';
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 4ef9a64eeb733833028a046de3d7953e13a1d187..61b9e800b5609cee42dd2476b25c930608a472e6 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Titre';
 $wb['firstname_txt'] = 'Prénom';
 $wb['surname_txt'] = 'Nom';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index e443eb7801430b3a221c6a6c67d021792410f0d3..f09e408cc96d20ad69de347aa03f5a517d2e5ec8 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d
 $wb['limit_spamfilter_user_txt'] = 'Nombre maximal d’utilisateurs du filtre antispam';
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 448a91ea3923df7d588771d569e21a4c58674373..ef5d956d33e47e2e10817f09cdf3723085b4dc26 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -36,6 +36,7 @@ $wb['company_txt'] = 'Entreprise';
 $wb['title_txt'] = 'Titre';
 $wb['firstname_txt'] = 'Prénom';
 $wb['surname_txt'] = 'Nom';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
 $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index aac50a2f2a2561378d7249faf648533e0f8ee5b4..bdfcb839d34e2b31fd9c9d20015f3122c742edb0 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Poduzeće';
 $wb['title_txt'] = 'Naziv';
 $wb['firstname_txt'] = 'Ime';
 $wb['surname_txt'] = 'Prezime';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domena';
 $wb['limit_subdomain_txt'] = 'limit_poddomena';
 $wb['limit_webquota_txt'] = 'limit_prostora';
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index 4a2cd0500cfbc87a29a52c28b8caca28b657571c..23ff2def637b5a141d024fac4724b45a694b240e 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Veličina mailboxa';
 $wb['limit_spamfilter_wblist_txt'] = 'Maksimalan broj spamfilter white / blacklist filtera';
 $wb['limit_spamfilter_user_txt'] = 'Maksimalan broj spamfilter korisnika';
 $wb['limit_spamfilter_policy_txt'] = 'Maksimalan broj spamfilter pravila';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domena';
 $wb['limit_subdomain_txt'] = 'limit_poddomena';
 $wb['limit_webquota_txt'] = 'limit_prostora';
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 9b01f30b2df19de187796527f615bf4918e86858..24c84e5c23107cb756b0d63bfcd32473d7e51e3c 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Poduzeće';
 $wb['title_txt'] = 'Naziv';
 $wb['firstname_txt'] = 'Ime';
 $wb['surname_txt'] = 'Prezime';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domena';
 $wb['limit_subdomain_txt'] = 'limit_poddomena';
 $wb['limit_webquota_txt'] = 'limit_prostora';
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 402e5adf04c53a0a0539771feac27259ada8a920..9d3aba88b974ad086a58834913421b1b8679dad9 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Titulus';
 $wb['firstname_txt'] = 'Keresztnév';
 $wb['surname_txt'] = 'Vezetéknév';
 $wb['limit_client_txt'] = 'Max. number of Clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index 9300d945b615fe2eece54b702d0c16717f87e337..63a17660549b98b8e268688245823e6e9ece9839 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 5970b80d46fd715dc547a8c472aea0ea2a573630..ed67fba8863ca326e0320a1203edebd514c2c510 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Cég';
 $wb['title_txt'] = 'Titulus';
 $wb['firstname_txt'] = 'Keresztnév';
 $wb['surname_txt'] = 'Vezetéknév';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index c7b5cafa43e61bcb2835edce95127c9dadfebf8b..f4c3bd974c9896d2d95f4591e2f16e4b015f408a 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Perusahaan';
 $wb['title_txt'] = 'Judul';
 $wb['firstname_txt'] = 'Nama depan';
 $wb['surname_txt'] = 'Nama belakang';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'batasan domain';
 $wb['limit_subdomain_txt'] = 'batasan subdomain';
 $wb['limit_webquota_txt'] = 'batasan kuota web';
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 007b4af0da98ba6a80abb6b4645ce0553030f394..b6ecb87e26a8437a164525c3ac8eeaf6f37e7581 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Kuota Mailbox';
 $wb['limit_spamfilter_wblist_txt'] = 'Jumlah maks filter white/blacklist spamfilter';
 $wb['limit_spamfilter_user_txt'] = 'Jumlah maks pengguna spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Jumlah maks kebijakan spamfilter';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'batasan domain';
 $wb['limit_subdomain_txt'] = 'batasan subdomain';
 $wb['limit_webquota_txt'] = 'batasan kuota web';
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index 11b0d95d74e71583cb419f9415b43347fe16bb81..58450627eddf0d10847196a4d24049aae20805b6 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Perusahaan';
 $wb['title_txt'] = 'Judul';
 $wb['firstname_txt'] = 'Nama Depan';
 $wb['surname_txt'] = 'Nama Belakang';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'batasan domain';
 $wb['limit_subdomain_txt'] = 'batasan subdomain';
 $wb['limit_webquota_txt'] = 'batasan kuota web';
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 6ad3f11a202c9dfed9ba71a6824d05f1994c76ef..19b2a18b4adff8ea62b4fee8eeac5a0b26a0fe7e 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -36,6 +36,7 @@ $wb['title_txt'] = 'Titolo';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Cognome';
 $wb['limit_client_txt'] = 'Numero massimo clienti';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index bc1f90052aaafc4f098340adacf144e154fc4491..45f477918312e09c0fa541869e672976596bfb06 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Num. massimo filtri spam white / blacklist
 $wb['limit_spamfilter_user_txt'] = 'Num. massimo utenti spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Num. massimo policys spamfilter';
 $wb['limit_client_txt'] = 'Num. massimo clienti';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index a90a2d807873e7ac2e552bc6164e7281034fc4b0..f023dcf54d36cb54ff12efa67d5f6393c022c982 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -36,6 +36,7 @@ $wb['company_txt'] = 'Azienda';
 $wb['title_txt'] = 'Titolo';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Cognome';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index be88a575cdb66e599f18b3aa9d424bf8f103800a..6d25b13ce1db67263f214e57d41ad118821445c0 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = '社名';
 $wb['title_txt'] = '役職';
 $wb['firstname_txt'] = '名';
 $wb['surname_txt'] = '姓';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index ca83bda97a8aa9f8f61c9a32c4afa192a0f146df..768e56cc42e3765b44bab8cbead7a7c991d35562 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'メールボックスの容量';
 $wb['limit_spamfilter_wblist_txt'] = '迷惑メールのホワイトリスト、ブラックリストフィルターの最大数';
 $wb['limit_spamfilter_user_txt'] = 'スパムフィルターユーザーの最大数';
 $wb['limit_spamfilter_policy_txt'] = '迷惑メールフィルタのポリシーの最大数';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index 1b89262493794ca8d14e1e95203cf282ec7e2b70..1c5851bdfc5a4c6c4aa9403a41fa311e6e938fe5 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = '社名';
 $wb['title_txt'] = '役職';
 $wb['firstname_txt'] = '名';
 $wb['surname_txt'] = '姓';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 1f4e5d70a1471c06b694fb86fa2cbe1843f9c91b..9d0160da3238dcd0f2075165421b73c2f277676c 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -39,6 +39,7 @@ $wb['company_txt'] = 'Bedrijfsnaam';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Voornaam';
 $wb['surname_txt'] = 'Achternaam';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limiet_domein';
 $wb['limit_subdomain_txt'] = 'limiet_subdomein';
 $wb['limit_webquota_txt'] = 'limiet_webquota';
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index 423b4d7b946da68910346f3a94c925a9532a0678..d6bfd660e2d32089fa105c166b5dbb84b449e57e 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. aantal spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. aantal spamfilter gebruikers';
 $wb['limit_spamfilter_policy_txt'] = 'Max. aantal spamfilter policys';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limiet_domein';
 $wb['limit_subdomain_txt'] = 'limiet_subdomein';
 $wb['limit_webquota_txt'] = 'limiet_webquota';
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 637dddc65d2ca6b90dc6e43a376a6f3fe74b06de..1cb2abbd9ca0121920a5f6c1e38d6d7103718373 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -38,6 +38,7 @@ $wb['company_txt'] = 'Bedrijfnaam';
 $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Voornaam';
 $wb['surname_txt'] = 'Achternaam';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limiet_domein';
 $wb['limit_subdomain_txt'] = 'limiet_subdomein';
 $wb['limit_webquota_txt'] = 'limiet_webquota';
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index c040e787ae5c190590a9797fdbdd24dba8fba7a9..67ea97fbe6e5cc766731a85d458a4f181b0998b6 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Firma';
 $wb['title_txt'] = 'Tytuł';
 $wb['firstname_txt'] = 'Imię';
 $wb['surname_txt'] = 'Nazwisko';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Limit domen';
 $wb['limit_subdomain_txt'] = 'Limit subdomen';
 $wb['limit_webquota_txt'] = 'Limit pojemności www';
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index 5945310d0c9ec00b5d46baf515beafabc4aa3835..95e2b48d5d505d2ea258bdb73df7d05c8862dcff 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'Pojemność skrzynki';
 $wb['limit_spamfilter_wblist_txt'] = 'Maksymalna ilość filtrów spamu białej / czarnej listy';
 $wb['limit_spamfilter_user_txt'] = 'Maksymalna ilość filtrów spamu użytkowników';
 $wb['limit_spamfilter_policy_txt'] = 'Maksymalna ilość polityk filtrów spamu';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domen';
 $wb['limit_subdomain_txt'] = 'limit_subdomen';
 $wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 2762ebc15b1d110fb33e0dbc1646be88582bc82b..8ada7b86c7524d12f8c34be67831e56a502bbfaf 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Firma';
 $wb['title_txt'] = 'Tytuł';
 $wb['firstname_txt'] = 'Imię';
 $wb['surname_txt'] = 'Nazwisko';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domen';
 $wb['limit_subdomain_txt'] = 'limit_subdomen';
 $wb['limit_webquota_txt'] = 'limit_pojemnosci_www';
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 8ce72350798ba5432ac6b32e158d6fa1fd0dd368..6b41a2fe3a976d590a1caad8b029dee7f99f34fc 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Empresa';
 $wb['title_txt'] = 'Título';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Sobrenome';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limite_dominio';
 $wb['limit_subdomain_txt'] = 'limit_subdominio';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index b774a8c4108f507aaf481468b6be0e47b9b63a4f..98cda03d0addcf14fac8da06c2964ea5f8e619d0 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'Espaço de Caixa de Correio';
 $wb['limit_spamfilter_wblist_txt'] = 'Número máximo de spamfilter permitidos /lista negra';
 $wb['limit_spamfilter_user_txt'] = 'Número máx de utilizadors spamfilter';
 $wb['limit_spamfilter_policy_txt'] = 'Número máx de políticas spamfilter';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limite_dominio';
 $wb['limit_subdomain_txt'] = 'limite_subdominio';
 $wb['limit_webquota_txt'] = 'limite_webquota';
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 965a446ffbab60c3ce935efae3b94d7be12f2aa1..eeb8f69c05f53d40d558870446fe7a64c50c50ed 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Empresa';
 $wb['title_txt'] = 'Título';
 $wb['firstname_txt'] = 'Nome';
 $wb['surname_txt'] = 'Sobrenome';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limite_domínio';
 $wb['limit_subdomain_txt'] = 'limite_subdomínio';
 $wb['limit_webquota_txt'] = 'limite_webquota';
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 5ee1d8aaf6caf2c8e70adfd8a8e2c8db80ffb119..fdf112f7af51802dba4d3ed09820f0ba5ea13b29 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Companie';
 $wb['title_txt'] = 'Titlu';
 $wb['firstname_txt'] = 'Prenume';
 $wb['surname_txt'] = 'Nume';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limita_domeniu';
 $wb['limit_subdomain_txt'] = 'limita_subdomeniu';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index 65e110c2abcf40f51d9c961a70cbdc6275484c83..77c024db641e522856be92879c748f794849d7ae 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index afd557ab1897aa649244717150888d75beec1715..4d21c7d173522f9aa06151eb20d6c6ce3fc1dee0 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 70456bd2553d74625ac999d4e7326aabadbe4465..920020e9f4fd917b4e13e828a6f4a6b074224aab 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -37,6 +37,7 @@ $wb['title_txt'] = 'Заголовок';
 $wb['firstname_txt'] = 'Имя';
 $wb['surname_txt'] = 'Фамилия';
 $wb['limit_client_txt'] = 'Макс. количество клиентов';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Лимит доменов';
 $wb['limit_subdomain_txt'] = 'Лимит поддоменов';
 $wb['limit_webquota_txt'] = 'Лимит Web-квоты';
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index e540984824afad914244248dfead787b36bfc7fe..94842e91556022997cd8b7ffe78b4933180c0cf8 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Макс. количество прави
 $wb['limit_spamfilter_user_txt'] = 'Макс. количество пользователей спам-фильтра';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. количество правил спам-фильтра';
 $wb['limit_client_txt'] = 'Макс. количество клиентов';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Макс. количество доменов';
 $wb['limit_subdomain_txt'] = 'Лимит поддоменов';
 $wb['limit_webquota_txt'] = 'Лимит Web-квоты';
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 4b90d0347ac2941b940575347729119d865fe11d..aeac8ab7d796bde274922f108511d5fa857e3519 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Компания';
 $wb['title_txt'] = 'Заголовок';
 $wb['firstname_txt'] = 'Имя';
 $wb['surname_txt'] = 'Фамилия';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'Лимит доменов';
 $wb['limit_subdomain_txt'] = 'Лимит поддоменов';
 $wb['limit_webquota_txt'] = 'Лимит Web-квоты';
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index bf585054cd11f2a8416550e2754fbacfb7bb3b97..f9a9b8ef4cd41d363f1524de304504a940e167c5 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -38,6 +38,7 @@ $wb['title_txt'] = 'Titel';
 $wb['firstname_txt'] = 'Förnamn';
 $wb['surname_txt'] = 'Efternamn';
 $wb['limit_client_txt'] = 'Max antal kunder';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'domängräns';
 $wb['limit_subdomain_txt'] = 'underdomängräns';
 $wb['limit_webquota_txt'] = 'webbsideskvot';
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index c9001e42e29ab6a7fb67b3bc89eaecfef07fc6ac..ffffed1971052d0619ea593f8ce53027ede8ffa7 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -15,6 +15,7 @@ $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklis
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['limit_client_txt'] = 'Max. number of Clients';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index afd557ab1897aa649244717150888d75beec1715..4d21c7d173522f9aa06151eb20d6c6ce3fc1dee0 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Company';
 $wb['title_txt'] = 'Title';
 $wb['firstname_txt'] = 'Firstname';
 $wb['surname_txt'] = 'Surname';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index cfaced056192b3a747185c29f98d6d3ae70de939..980ae853353662bb635c1b0344b33eb1073b131d 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Spoločnosť';
 $wb['title_txt'] = 'Názov';
 $wb['firstname_txt'] = 'Krstné meno';
 $wb['surname_txt'] = 'Priezvisko';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domén';
 $wb['limit_subdomain_txt'] = 'limit_subdomén';
 $wb['limit_webquota_txt'] = 'limit_webkvóta';
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index 9a602da09369509d57d2a6dc5c50cb2634f2ff6a..14172a1f621d2e2e54779c5716c2584e4bb774a4 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -14,6 +14,7 @@ $wb['limit_mailquota_txt'] = 'Kvóta schránky';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. počet Spamfilter bielych / čiernych listín filtrov';
 $wb['limit_spamfilter_user_txt'] = 'Max. počet poUžívateľských Spamfilterov';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domén';
 $wb['limit_subdomain_txt'] = 'limit_subdomén';
 $wb['limit_webquota_txt'] = 'limit_webkvôt';
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 47dbd4f64c7d963144825bc4346c37d47f22b91a..040ffc47ca4c2a9c5e1ec75d2e6cae753a3c3fde 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -37,6 +37,7 @@ $wb['company_txt'] = 'Spoločnosť';
 $wb['title_txt'] = 'Nadpis';
 $wb['firstname_txt'] = 'Krstné meno';
 $wb['surname_txt'] = 'Priezvisko';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domén';
 $wb['limit_subdomain_txt'] = 'limit_subdomén';
 $wb['limit_webquota_txt'] = 'limit_webkvóta';
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index a922525b67dc39f6f91151ee7db0d2796ba8c3eb..5e6e55f543745b1c7dba6ea368b1cfc05dbd3613 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Kuruluş';
 $wb['title_txt'] = 'Unvan';
 $wb['firstname_txt'] = 'Ad';
 $wb['surname_txt'] = 'Soyad';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 64b54bb30e6c7ddd4923b7f30edb1efcd0089efb..84c7fa05438e6a8cba9d3fda5cd4bb61d85ffb79 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -19,6 +19,7 @@ $wb['limit_mailquota_txt'] = 'E-posta Kutusu Kotası';
 $wb['limit_spamfilter_wblist_txt'] = 'En Fazla Önemsiz İleti Beyaz/Kara Liste Süzgeci Sayısı';
 $wb['limit_spamfilter_user_txt'] = 'En Fazla Önemsiz İleti Süzgeci Kullanıcı Sayısı';
 $wb['limit_spamfilter_policy_txt'] = 'En Fazla Önemsiz İleti Süzgeci Kuralı Sayısı';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index 023bc081978d36ce5bb49765234f7eae9395972e..169d8c5ea4109768cec42938376184f1ea0ef666 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -40,6 +40,7 @@ $wb['company_txt'] = 'Kuruluş';
 $wb['title_txt'] = 'Unvan';
 $wb['firstname_txt'] = 'Adı';
 $wb['surname_txt'] = 'Soyadı';
+$wb['limit_relayhost_txt'] = 'Show SMTP relay host options';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 39512208b45dbf2f93e1cb5215f8243cadcc5ef0..b7a0ccf69c52491a23e46ed4435c2b3dca64fd9d 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -235,6 +235,14 @@
                     <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" /></div>
 				</div>
+				<tmpl_if name="show_per_domain_relay_options">
+				<div class="form-group">
+						<label class="col-sm-3 control-label">{tmpl_var name='limit_relayhost_txt'}</label>
+						<div class="col-sm-9">
+								{tmpl_var name='limit_relayhost'}
+						</div>
+				</div>
+			</tmpl_if>
       </div>
   </div>
   </div>
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 4573e4b0d6b31977ad6deb1d97a0d1f69caeafa9..8aa6d87ac72fcb721fc00e90f6c6037acc14745a 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -192,6 +192,14 @@
                     <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" /></div>
 				</div>
+        <tmpl_if name="show_per_domain_relay_options">
+				<div class="form-group">
+						<label class="col-sm-3 control-label">{tmpl_var name='limit_relayhost_txt'}</label>
+						<div class="col-sm-9">
+								{tmpl_var name='limit_relayhost'}
+						</div>
+				</div>
+			</tmpl_if>
 			</div>
       </div>
   </div>
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index ff185ce9a40925038ecd7553a1ec8353a16b51f8..cbc8c38c57cd1b7a1ff25783126459b764f19e43 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -236,6 +236,14 @@
                     <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" /></div>
 				</div>
+        <tmpl_if name="show_per_domain_relay_options">
+				<div class="form-group">
+						<label class="col-sm-3 control-label">{tmpl_var name='limit_relayhost_txt'}</label>
+						<div class="col-sm-9">
+								{tmpl_var name='limit_relayhost'}
+						</div>
+				</div>
+			</tmpl_if>
 			</div>
       </div>
   </div>
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 3ea60c08f92b9de4f2fab257cbfa43811e92b540..2d4ee1bc3ea37f5120253d6fb12eec45871c13f7 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -190,7 +190,6 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("domain_module", 0);
 		}
 
-
 		// Get the spamfilter policys for the user
 		$tmp_user = $app->db->queryOneRecord("SELECT policy_id FROM spamfilter_users WHERE email = ?", '@' . $this->dataRecord["domain"]);
 		$sql = "SELECT id, policy_name FROM spamfilter_policy WHERE ".$app->tform->getAuthSQL('r')." ORDER BY policy_name";
@@ -215,24 +214,43 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("edit_disabled", 0);
 		}
 
+		// Check wether per domain relaying is enabled or not
+		$global_config = $app->getconf->get_global_config('mail');
+		if($global_config['show_per_domain_relay_options'] == 'y') {
+			$app->tpl->setVar("show_per_domain_relay_options", 1);
+		} else {
+			$app->tpl->setVar("show_per_domain_relay_options", 0);
+		}
+
+		// Get the limits of the client
+		$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+		$client = $app->db->queryOneRecord("SELECT limit_relayhost FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+		if ($client["limit_relayhost"] == 'y' || $_SESSION["s"]["user"]["typ"] == 'admin') {
+			$app->tpl->setVar("limit_relayhost", 1);
+		} else {
+			$app->tpl->setVar("limit_relayhost", 0);
+		}
+
 		// load relayhost-values
-		$sql = "SELECT relay_host, relay_user, relay_pass FROM mail_domain WHERE domain_id = ?";
-		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
-		$app->tpl->setVar('relay_host', $rec['relay_host'], true);
-		$app->tpl->setVar('relay_user', $rec['relay_user'], true);
-		$app->tpl->setVar('relay_pass', $rec['relay_pass'], true);
+		if ($client["limit_relayhost"] == 'y') {
+			$sql = "SELECT relay_host, relay_user, relay_pass FROM mail_domain WHERE domain_id = ?";
+			$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
+			$app->tpl->setVar('relay_host', $rec['relay_host'], true);
+			$app->tpl->setVar('relay_user', $rec['relay_user'], true);
+			$app->tpl->setVar('relay_pass', $rec['relay_pass'], true);
+		}
 
 		// load dkim-values
 		$sql = "SELECT domain, dkim_private, dkim_public, dkim_selector FROM mail_domain WHERE domain_id = ?";
 		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
 		$dns_key = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$rec['dkim_public']);
-                
+
                 $keyparts = str_split('v=DKIM1; t=s; p=' . $dns_key, 200);
                 array_walk($keyparts, function(&$value, $key) { $value = '"'.$value.'"'; } );
                 $dkim_txt = implode('', $keyparts);
 
 		$dns_record = $rec['dkim_selector'] . '._domainkey.' . $rec['domain'] . '. 3600  IN  TXT   '.$dkim_txt;
-                
+
 		$app->tpl->setVar('dkim_selector', $rec['dkim_selector'], true);
 		$app->tpl->setVar('dkim_private', $rec['dkim_private'], true);
 		$app->tpl->setVar('dkim_public', $rec['dkim_public'], true);
@@ -267,8 +285,14 @@ class page_action extends tform_actions {
 			// When the record is updated
 			if($this->id > 0) {
 				// restore the server ID if the user is not admin and record is edited
-				$tmp = $app->db->queryOneRecord("SELECT server_id FROM mail_domain WHERE domain_id = ?", $this->id);
+				$tmp = $app->db->queryOneRecord("SELECT server_id, relay_host, relay_user, relay_pass FROM mail_domain WHERE domain_id = ?", $this->id);
 				$this->dataRecord["server_id"] = $tmp["server_id"];
+
+				// set the settings to current if not provided (or cleared due to limits)
+				if($this->dataRecord['relay_host'] == '') $this->dataRecord['relay_host'] = $tmp['relay_host'];
+				if($this->dataRecord['relay_user'] == '') $this->dataRecord['relay_user'] = $tmp['relay_user'];
+				if($this->dataRecord['relay_pass'] == '') $this->dataRecord['relay_pass'] = $tmp['relay_pass'];
+
 				unset($tmp);
 				// When the record is inserted
 			} else {
@@ -296,7 +320,7 @@ class page_action extends tform_actions {
 			$this->dataRecord["domain"] = $app->functions->idn_encode($this->dataRecord["domain"]);
 			$this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
 		}
-		
+
 		//* server_id must be > 0
 		if(isset($this->dataRecord["server_id"]) && $this->dataRecord["server_id"] < 1) $app->tform->errorMessage .= $app->lng("server_id_0_error_txt");
 
@@ -305,7 +329,7 @@ class page_action extends tform_actions {
 
 	function onAfterInsert() {
 		global $app, $conf;
-		
+
 		$domain = $app->functions->idn_encode($this->dataRecord["domain"]);
 
 		// Spamfilter policy
@@ -319,10 +343,10 @@ class page_action extends tform_actions {
 				$tmp_domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain_id = ?", $this->id);
 				// We create a new record
 				$insert_data = array(
-					"sys_userid" => $_SESSION["s"]["user"]["userid"], 
+					"sys_userid" => $_SESSION["s"]["user"]["userid"],
 					"sys_groupid" => $tmp_domain["sys_groupid"],
-					"sys_perm_user" => 'riud', 
-					"sys_perm_group" => 'riud', 
+					"sys_perm_user" => 'riud',
+					"sys_perm_group" => 'riud',
 					"sys_perm_other" => '',
 					"server_id" => $this->dataRecord["server_id"],
 					"priority" => 5,
@@ -350,7 +374,7 @@ class page_action extends tform_actions {
 
 	function onBeforeUpdate() {
 		global $app, $conf;
-		
+
 		$domain = $app->functions->idn_encode($this->dataRecord["domain"]);
 
 		//* Check if the server has been changed
@@ -381,7 +405,7 @@ class page_action extends tform_actions {
 		global $app, $conf;
 
 		$domain = $app->functions->idn_encode($this->dataRecord["domain"]);
-		
+
 		// Spamfilter policy
 		$policy_id = $app->functions->intval($this->dataRecord["policy"]);
 		$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = ?", '@' . $domain);
@@ -393,10 +417,10 @@ class page_action extends tform_actions {
 				$tmp_domain = $app->db->queryOneRecord("SELECT sys_groupid FROM mail_domain WHERE domain_id = ?", $this->id);
 				// We create a new record
 				$insert_data = array(
-					"sys_userid" => $_SESSION["s"]["user"]["userid"], 
+					"sys_userid" => $_SESSION["s"]["user"]["userid"],
 					"sys_groupid" => $tmp_domain["sys_groupid"],
-					"sys_perm_user" => 'riud', 
-					"sys_perm_group" => 'riud', 
+					"sys_perm_user" => 'riud',
+					"sys_perm_group" => 'riud',
 					"sys_perm_other" => '',
 					"server_id" => $this->dataRecord["server_id"],
 					"priority" => 5,
@@ -447,7 +471,7 @@ class page_action extends tform_actions {
 
 			//* Update the mailinglist
 			$app->db->query("UPDATE mail_mailinglist SET sys_userid = ?, sys_groupid = ? WHERE domain = ?", $client_user_id, $sys_groupid, $this->oldDataRecord['domain']);
-			
+
 			//* Update fetchmail accounts
 			$fetchmail = $app->db->queryAllRecords("SELECT * FROM mail_get WHERE destination like ?", '%@' . $this->oldDataRecord['domain']);
 			if(is_array($fetchmail)) {
@@ -456,7 +480,7 @@ class page_action extends tform_actions {
 					$app->db->datalogUpdate('mail_get', array("destination" => $destination, "sys_userid" => $client_user_id, "sys_groupid" => $sys_groupid), 'mailget_id', $rec['mailget_id']);
 				}
 			}
-			
+
 			//* Delete the old spamfilter record
 			$tmp = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = ?", '@' . $this->oldDataRecord["domain"]);
 			$app->db->datalogDelete('spamfilter_users', 'id', $tmp["id"]);
@@ -467,10 +491,10 @@ class page_action extends tform_actions {
 		//* update dns-record when the dkim record was changed
 		// NOTE: only if the domain-name was not changed
 		if ( $this->dataRecord['active'] == 'y' && $domain ==  $this->oldDataRecord['domain'] ) {
-			$dkim_active = @($this->dataRecord['dkim'] == 'y') ? true : false; 
+			$dkim_active = @($this->dataRecord['dkim'] == 'y') ? true : false;
 			$selector = @($this->dataRecord['dkim_selector'] != $this->oldDataRecord['dkim_selector']) ? true : false;
 			$dkim_private = @($this->dataRecord['dkim_private'] != $this->oldDataRecord['dkim_private']) ? true : false;
-			
+
 			$soaDomain = $domain.'.';
 			while ((!isset($soa) && (substr_count($soaDomain,'.') > 1))) {
 				$soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $soaDomain);
@@ -493,7 +517,7 @@ class page_action extends tform_actions {
 						$soa_id = $app->functions->intval($soa['zone']);
 						$serial = $app->validate_dns->increase_serial($soa["serial"]);
 						$app->db->datalogUpdate('dns_soa', array("serial" => $serial), 'id', $soa_id);
-					}	
+					}
 				}
 		}
 
@@ -510,8 +534,8 @@ class page_action extends tform_actions {
 				$app->db->datalogDelete('dns_rr', 'id', $r['id']);
 			}
 		}
-		
-		// also delete a dsn-records with same selector 
+
+		// also delete a dsn-records with same selector
 		$sql = "SELECT * from dns_rr WHERE name ? AND data LIKE 'v=DKIM1%' AND " . $app->tform->getAuthSQL('r');
 		$rec = $app->db->queryAllRecords($sql, '._domainkey.'.$dataRecord['dkim_selector'].'.', $dataRecord['domain']);
 		if (is_array($rec))
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 676e55f9dcc3b102f7f9ec61424d9cef551f8e02..3486dcfff203c803eb30337df1bb3d62f6958e85 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -75,24 +75,28 @@
                     {tmpl_var name='policy'}
                 </select></div>
             </div>
-            <div class="form-group">
+            <tmpl_if name="show_per_domain_relay_options">
+            <tmpl_if name="limit_relayhost">
+              <div class="form-group">
                 <label for="relay_host" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
                 <div class="col-sm-9">
-                    <input type="text" name="relay_host" id="relay_host" value="{tmpl_var name='relay_host'}" class="form-control" />
+                  <input type="text" name="relay_host" id="relay_host" value="{tmpl_var name='relay_host'}" class="form-control" />
                 </div>
-            </div>
-            <div class="form-group">
+              </div>
+              <div class="form-group">
                 <label for="relay_user" class="col-sm-3 control-label">{tmpl_var name='relayhost_user_txt'}</label>
                 <div class="col-sm-9">
-                    <input type="text" name="relay_user" id="relay_user" value="{tmpl_var name='relay_user'}" class="form-control" />
+                  <input type="text" name="relay_user" id="relay_user" value="{tmpl_var name='relay_user'}" class="form-control" />
                 </div>
-            </div>
-            <div class="form-group">
+              </div>
+              <div class="form-group">
                 <label for="relay_pass" class="col-sm-3 control-label">{tmpl_var name='relayhost_password_txt'}</label>
                 <div class="col-sm-9">
-                    <input type="text" name="relay_pass" id="relay_pass" value="{tmpl_var name='relay_pass'}" class="form-control" />
+                  <input type="text" name="relay_pass" id="relay_pass" value="{tmpl_var name='relay_pass'}" class="form-control" />
                 </div>
-            </div>
+              </div>
+            </tmpl_if>
+            </tmpl_if>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
@@ -131,7 +135,7 @@
 
             </div>
 
-        
+
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="type" value="local">
@@ -150,11 +154,11 @@
 			domain_id : domain_id,
 			dkim_public : dkim_public,
 			dkim_selector : dkim_selector,
-			type : "create_dkim" 
+			type : "create_dkim"
 		}, function(data) {
                         var dkim_txt = 'v=DKIM1; t=s; p=' + data['dns_record'].replace(/(\r\n|\n|\r)/gm, "");
 			var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600   IN	TXT	' + dkim_txt.match(new RegExp('.{1,' + '200' + '}', 'g')).map(chunk =>  '"' + chunk + '"').join('');
-                        
+
 			$("#dkim_selector").val(data.dkim_selector);
 			$("#dkim_public").val(data.dkim_public);
 			$("#dkim_private").val(data.dkim_private);
@@ -162,5 +166,3 @@
 		});
 	};
 </script>
-
-