From 6ac2ee44483040cd9c22c8e50f3252aa54d2422c Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 14 Jan 2021 14:25:29 -0700
Subject: [PATCH] add client limit for number of white / blacklist

---
 .../sql/incremental/upd_dev_collection.sql    |  5 ++-
 install/sql/ispconfig3.sql                    |  2 +
 interface/web/client/form/client.tform.php    | 14 +++++++
 .../web/client/form/client_template.tform.php | 14 +++++++
 interface/web/client/form/reseller.tform.php  | 14 +++++++
 interface/web/client/lib/lang/ar_client.lng   |  3 +-
 .../client/lib/lang/ar_client_template.lng    |  3 +-
 interface/web/client/lib/lang/ar_reseller.lng |  3 +-
 interface/web/client/lib/lang/bg_client.lng   |  3 +-
 .../client/lib/lang/bg_client_template.lng    |  3 +-
 interface/web/client/lib/lang/bg_reseller.lng |  3 +-
 interface/web/client/lib/lang/br_client.lng   |  2 +
 .../client/lib/lang/br_client_template.lng    |  2 +
 interface/web/client/lib/lang/br_reseller.lng |  2 +
 interface/web/client/lib/lang/ca_client.lng   |  3 +-
 .../client/lib/lang/ca_client_template.lng    |  3 +-
 interface/web/client/lib/lang/ca_reseller.lng |  3 +-
 interface/web/client/lib/lang/cz_client.lng   |  2 +
 .../client/lib/lang/cz_client_template.lng    |  2 +
 interface/web/client/lib/lang/cz_reseller.lng |  2 +
 interface/web/client/lib/lang/de_client.lng   |  3 +-
 .../client/lib/lang/de_client_template.lng    |  3 +-
 interface/web/client/lib/lang/de_reseller.lng |  3 +-
 interface/web/client/lib/lang/dk_client.lng   |  3 +-
 .../client/lib/lang/dk_client_template.lng    |  3 +-
 interface/web/client/lib/lang/dk_reseller.lng |  3 +-
 interface/web/client/lib/lang/el_client.lng   |  3 +-
 .../client/lib/lang/el_client_template.lng    |  3 +-
 interface/web/client/lib/lang/el_reseller.lng |  3 +-
 interface/web/client/lib/lang/en_client.lng   |  3 +-
 .../client/lib/lang/en_client_template.lng    |  3 +-
 interface/web/client/lib/lang/en_reseller.lng |  3 +-
 interface/web/client/lib/lang/es_client.lng   |  3 +-
 .../client/lib/lang/es_client_template.lng    |  3 +-
 interface/web/client/lib/lang/es_reseller.lng |  3 +-
 interface/web/client/lib/lang/fi_client.lng   |  3 +-
 .../client/lib/lang/fi_client_template.lng    |  3 +-
 interface/web/client/lib/lang/fi_reseller.lng |  3 +-
 interface/web/client/lib/lang/fr_client.lng   |  3 +-
 .../client/lib/lang/fr_client_template.lng    |  3 +-
 interface/web/client/lib/lang/fr_reseller.lng |  3 +-
 interface/web/client/lib/lang/hr_client.lng   |  3 +-
 .../client/lib/lang/hr_client_template.lng    |  3 +-
 interface/web/client/lib/lang/hr_reseller.lng |  3 +-
 interface/web/client/lib/lang/hu_client.lng   |  3 +-
 .../client/lib/lang/hu_client_template.lng    |  3 +-
 interface/web/client/lib/lang/hu_reseller.lng |  3 +-
 interface/web/client/lib/lang/id_client.lng   |  3 +-
 .../client/lib/lang/id_client_template.lng    |  3 +-
 interface/web/client/lib/lang/id_reseller.lng |  3 +-
 interface/web/client/lib/lang/it_client.lng   |  3 +-
 .../client/lib/lang/it_client_template.lng    |  3 +-
 interface/web/client/lib/lang/it_reseller.lng |  3 +-
 interface/web/client/lib/lang/ja_client.lng   |  3 +-
 .../client/lib/lang/ja_client_template.lng    |  3 +-
 interface/web/client/lib/lang/ja_reseller.lng |  3 +-
 interface/web/client/lib/lang/nl_client.lng   |  3 +-
 .../client/lib/lang/nl_client_template.lng    |  3 +-
 interface/web/client/lib/lang/nl_reseller.lng |  3 +-
 interface/web/client/lib/lang/pl_client.lng   |  3 +-
 .../client/lib/lang/pl_client_template.lng    |  3 +-
 interface/web/client/lib/lang/pl_reseller.lng |  3 +-
 interface/web/client/lib/lang/pt_client.lng   |  3 +-
 .../client/lib/lang/pt_client_template.lng    |  3 +-
 interface/web/client/lib/lang/pt_reseller.lng |  3 +-
 interface/web/client/lib/lang/ro_client.lng   |  3 +-
 .../client/lib/lang/ro_client_template.lng    |  3 +-
 interface/web/client/lib/lang/ro_reseller.lng |  3 +-
 interface/web/client/lib/lang/ru_client.lng   |  3 +-
 .../client/lib/lang/ru_client_template.lng    |  3 +-
 interface/web/client/lib/lang/ru_reseller.lng |  3 +-
 interface/web/client/lib/lang/se_client.lng   |  3 +-
 .../client/lib/lang/se_client_template.lng    |  3 +-
 interface/web/client/lib/lang/se_reseller.lng |  3 +-
 interface/web/client/lib/lang/sk_client.lng   |  3 +-
 .../client/lib/lang/sk_client_template.lng    |  3 +-
 interface/web/client/lib/lang/sk_reseller.lng |  3 +-
 interface/web/client/lib/lang/tr_client.lng   |  3 +-
 .../client/lib/lang/tr_client_template.lng    |  3 +-
 interface/web/client/lib/lang/tr_reseller.lng |  3 +-
 .../client/templates/client_edit_limits.htm   |  3 ++
 .../templates/client_template_edit_limits.htm |  3 ++
 .../client/templates/reseller_edit_limits.htm |  3 ++
 interface/web/dashboard/dashlets/limits.php   |  4 ++
 .../web/mail/lib/lang/ar_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/ar_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/bg_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/bg_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/br_mail_blacklist.lng   |  1 +
 .../web/mail/lib/lang/br_mail_whitelist.lng   |  1 +
 .../web/mail/lib/lang/ca_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/ca_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/cz_mail_blacklist.lng   |  1 +
 .../web/mail/lib/lang/cz_mail_whitelist.lng   |  1 +
 .../web/mail/lib/lang/de_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/de_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/dk_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/dk_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/el_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/el_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/en_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/en_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/es_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/es_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/fi_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/fi_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/fr_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/fr_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/hr_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/hr_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/hu_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/hu_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/id_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/id_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/it_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/it_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/ja_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/ja_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/nl_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/nl_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/pl_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/pl_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/pt_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/pt_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/ro_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/ro_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/ru_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/ru_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/se_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/se_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/sk_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/sk_mail_whitelist.lng   |  2 +-
 .../web/mail/lib/lang/tr_mail_blacklist.lng   |  2 +-
 .../web/mail/lib/lang/tr_mail_whitelist.lng   |  2 +-
 interface/web/mail/mail_blacklist_edit.php    | 36 ++++++++++++++++--
 interface/web/mail/mail_whitelist_edit.php    | 37 +++++++++++++++++--
 remoting_client/API-docs/client_add.html      |  1 +
 remoting_client/API-docs/client_update.html   |  1 +
 remoting_client/examples/client_add.php       |  1 +
 139 files changed, 329 insertions(+), 124 deletions(-)

diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 02a94fdc1a..13b1e1097e 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1 +1,4 @@
-ALTER TABLE `remote_user` MODIFY `remote_password` VARCHAR(200) NOT NULL DEFAULT '';
\ No newline at end of file
+ALTER TABLE `remote_user` MODIFY `remote_password` VARCHAR(200) NOT NULL DEFAULT '';
+
+ALTER TABLE `client` ADD COLUMN `limit_mail_wblist` INT(11) NOT NULL DEFAULT '0' AFTER `limit_mailrouting`;
+ALTER TABLE `client_template` ADD COLUMN `limit_mail_wblist` INT(11) NOT NULL DEFAULT '0' AFTER `limit_mailrouting`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index d4640ea47a..333a908a5a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -178,6 +178,7 @@ CREATE TABLE `client` (
   `limit_mailforward` int(11) NOT NULL DEFAULT '-1',
   `limit_mailcatchall` int(11) NOT NULL DEFAULT '-1',
   `limit_mailrouting` int(11) NOT NULL DEFAULT '0',
+  `limit_mail_wblist` int(11) NOT NULL DEFAULT '0',
   `limit_mailfilter` int(11) NOT NULL DEFAULT '-1',
   `limit_fetchmail` int(11) NOT NULL DEFAULT '-1',
   `limit_mailquota` int(11) NOT NULL DEFAULT '-1',
@@ -309,6 +310,7 @@ CREATE TABLE `client_template` (
   `limit_mailforward` int(11) NOT NULL default '-1',
   `limit_mailcatchall` int(11) NOT NULL default '-1',
   `limit_mailrouting` int(11) NOT NULL default '0',
+  `limit_mail_wblist` int(11) NOT NULL default '0',
   `limit_mailfilter` int(11) NOT NULL default '-1',
   `limit_fetchmail` int(11) NOT NULL default '-1',
   `limit_mailquota` int(11) NOT NULL default '-1',
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 0801ae3515..7ad9aecac6 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -840,6 +840,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_wblist' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_mail_wblist_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_mailfilter' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'TEXT',
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index 4a3405bbe5..5883cce56c 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -256,6 +256,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_wblist' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_mail_wblist_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_mailfilter' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'TEXT',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index 3c559c78d6..8c94132b3b 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -838,6 +838,20 @@ $form["tabs"]['limits'] = array (
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_wblist' => array (
+			'datatype' => 'INTEGER',
+			'formtype' => 'TEXT',
+			'validators' => array (  0 => array ( 'type' => 'ISINT',
+					'errmsg'=> 'limit_mail_wblist_error_notint'),
+			),
+			'default' => '-1',
+			'value'  => '',
+			'separator' => '',
+			'width'  => '10',
+			'maxlength' => '10',
+			'rows'  => '',
+			'cols'  => ''
+		),
 		'limit_mailfilter' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'TEXT',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index 04a7c6d17f..fde7171aa2 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -68,6 +69,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index 0a88594a59..fe67603b19 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -37,6 +38,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index 512bc5cb23..afd557ab18 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index d6effa66e0..d9e5c1de61 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ email aliases';
 $wb['limit_mailforward_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ email forwarders';
 $wb['limit_mailcatchall_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ email filters';
 $wb['limit_fetchmail_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Ð Ð°Ð·Ð¼ÐµÑ€ Ð½Ð° Ð¿Ð¾Ñ‰ÐµÐ½ÑÐºÐ¸Ñ‚Ðµ ÐºÑƒÑ‚Ð¸Ð¸';
@@ -63,6 +64,7 @@ $wb['limit_mailalias_error_notint'] = ' The email alias Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡
 $wb['limit_mailforward_error_notint'] = 'The email forward Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailrouting_error_notint'] = 'The email routing Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailquota_error_notint'] = 'Ð Ð°Ð·Ð¼ÐµÑ€ÑŠÑ‚ Ð½Ð° Ð¿Ð¾Ñ‰ÐµÐ½ÑÐºÐ¸Ñ‚Ðµ ÐºÑƒÑ‚Ð¸Ð¸ Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index 75f89a0fea..0ca56504f1 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° email aliases';
 $wb['limit_mailforward_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° email forwarders';
 $wb['limit_mailcatchall_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° email filters';
 $wb['limit_fetchmail_txt'] = 'ÐœÐ°ÐºÑ. Ð±Ñ€Ð¾Ð¹ Ð½Ð° fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'ÐšÐ²Ð¾Ñ‚Ð° Ð½Ð° Ð¿Ð¾Ñ‰ÐµÐ½ÑÐºÐ°Ñ‚Ð° ÐºÑƒÑ‚Ð¸Ñ';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸
 $wb['limit_mailforward_error_notint'] = 'The email forward Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailrouting_error_notint'] = 'The email routing Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailquota_error_notint'] = 'The email quota Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index f749fa5519..d34dff83d6 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'ÐšÐ²Ð¾Ñ‚Ð° Ð½Ð° Ð¿Ð¾Ñ‰ÐµÐ½ÑÐºÐ°Ñ‚Ð° ÐºÑƒÑ‚Ð¸Ñ';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸
 $wb['limit_mailforward_error_notint'] = 'The email forward Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailrouting_error_notint'] = 'The email routing Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
 $wb['limit_mailquota_error_notint'] = 'The email quota Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ðµ Ñ‡Ð¸ÑÐ»Ð¾';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index 2f9d3c2056..4d2928459d 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Limite de alias de domÃnios';
 $wb['limit_mailforward_txt'] = 'Limite de encaminhamentos de email';
 $wb['limit_mailcatchall_txt'] = 'Limite de contas cata tudo';
 $wb['limit_mailrouting_txt'] = 'Limite de rotas de email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Limite de filtros de email';
 $wb['limit_fetchmail_txt'] = 'Limite de contas de busca';
 $wb['limit_mailquota_txt'] = 'Cota da conta de email';
@@ -73,6 +74,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'O limite de alias de domÃnios de e
 $wb['limit_mailforward_error_notint'] = 'O limite de encaminhamentos de email deve ser um nÃºmero.';
 $wb['limit_mailcatchall_error_notint'] = 'O limite de contas cata tudo deve ser um nÃºmero.';
 $wb['limit_mailrouting_error_notint'] = 'O limite de rotas de email deve ser um nÃºmero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'O limite de filtros de email deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'O limite de contas de busca deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'O limite das cotas de email deve ser um nÃºmero.';
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index bfafbeb823..3c866f48e7 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -12,6 +12,7 @@ $wb['limit_mailmailinglist_txt'] = 'Limite de listas de email';
 $wb['limit_mailforward_txt'] = 'Limite de encaminhamentos de email';
 $wb['limit_mailcatchall_txt'] = 'Limite de contas cata tudo';
 $wb['limit_mailrouting_txt'] = 'Limite de rotas de email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Limite de filtros de email';
 $wb['limit_fetchmail_txt'] = 'Limite de contas de busca';
 $wb['limit_mailquota_txt'] = 'Cota da conta de email';
@@ -47,6 +48,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'O limite de alias de domÃnios deve
 $wb['limit_mailforward_error_notint'] = 'O limite de encaminhamento de emails deve ser um nÃºmero.';
 $wb['limit_mailcatchall_error_notint'] = 'O limite de contas cata tudo deve ser um nÃºmero.';
 $wb['limit_mailrouting_error_notint'] = 'O limite de rotas de email deve ser um nÃºmero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'O limite de filtros de email deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'O limite de contas de busca deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'O limite da cota de emails deve ser um nÃºmero.';
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 08941ffd88..9dacacda44 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Limite de alias de domÃnios';
 $wb['limit_mailforward_txt'] = 'Limite de encaminhamentos de email';
 $wb['limit_mailcatchall_txt'] = 'Limite de contas cata tudo';
 $wb['limit_mailrouting_txt'] = 'Limite de rotas de email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Limite de filtros de email';
 $wb['limit_fetchmail_txt'] = 'Limite de contas de busca';
 $wb['limit_mailquota_txt'] = 'Cota de contas de email';
@@ -73,6 +74,7 @@ $wb['limit_mailalias_error_notint'] = 'O limite de alias de email deve ser um n
 $wb['limit_mailforward_error_notint'] = 'O limite de encaminhamentos deve ser um nÃºmero.';
 $wb['limit_mailcatchall_error_notint'] = 'O limite de contas cata tudo deve ser um nÃºmero.';
 $wb['limit_mailrouting_error_notint'] = 'O limite de rotas de email deve ser um nÃºmero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'O limite de filtros de email deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'O limite de contas de busca deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'O limite das cotas de email deve ser um nÃºmero.';
diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng
index e4cc2f2dbe..56b6718749 100644
--- a/interface/web/client/lib/lang/ca_client.lng
+++ b/interface/web/client/lib/lang/ca_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur courriel';
 $wb['limit_mailquota_txt'] = 'Quota des boites courriel';
@@ -61,6 +62,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit Ãªtre un
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur courriel doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit Ãªtre un nombre.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng
index aa51796744..c72d067822 100644
--- a/interface/web/client/lib/lang/ca_client_template.lng
+++ b/interface/web/client/lib/lang/ca_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur courriel';
 $wb['limit_mailquota_txt'] = 'Quota des boites courriel';
@@ -31,6 +32,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit Ãªtre un
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur courriel doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit Ãªtre un nombre.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng
index 411096ef54..de734d385b 100644
--- a/interface/web/client/lib/lang/ca_reseller.lng
+++ b/interface/web/client/lib/lang/ca_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur courriel';
 $wb['limit_mailquota_txt'] = 'Quota des boites courriel';
@@ -64,6 +65,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit Ãªtre un
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur courriel doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit Ãªtre un nombre.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 372080507e..c6bc86a59d 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. poÄet domÃ©novÃ½ch pÅ™ezdÃvek';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch pÅ™edavaÄÅ¯';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch koÅ¡Å¯';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smÄ›rovÃ¡nÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrÅ¯';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtÅ¯ externÃho zÃskÃ¡vÃ¡nÃ e-mailÅ¯';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta e-mailovÃ© schrÃ¡nky';
@@ -67,6 +68,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Limit pro e-mailovÃ© domÃ©novÃ© ali
 $wb['limit_mailforward_error_notint'] = 'Limit pro e-mailovÃ© pÅ™edÃ¡vÃ¡nÃ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailovÃ© koÅ¡e musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailovÃ¡ smÄ›rovÃ¡nÃ musÃ bÃ½t ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailovÃ© filtry limit musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit pro externÃ zÃskÃ¡vÃ¡nÃ e-mailÅ¯ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvÃ³tu musÃ bÃ½t ÄÃslo.';
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index 8cb8b34a4e..812a8e2766 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. poÄet domÃ©novÃ½ch pÅ™ezdÃvek';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch pÅ™edÃ¡vÃ¡nÃ';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch koÅ¡Å¯';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smÄ›rovÃ¡nÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrÅ¯';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtÅ¯ externÃho zÃskÃ¡vÃ¡nÃ e-mailÅ¯';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta e-mailovÃ© schrÃ¡nky';
@@ -37,6 +38,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Limit pro e-mailovÃ© domÃ©novÃ© ali
 $wb['limit_mailforward_error_notint'] = 'Limit pro e-mailovÃ© pÅ™edÃ¡vÃ¡nÃ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailovÃ© koÅ¡e musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailovÃ¡ smÄ›rovÃ¡nÃ musÃ bÃ½t ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailovÃ© filtry limit musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit pro externÃ zÃskÃ¡vÃ¡nÃ e-mailÅ¯ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvÃ³tu musÃ bÃ½t ÄÃslo.';
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 751afa6990..79888530b0 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. poÄet e-mailovÃ½ch aliasÅ¯';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch pÅ™edÃ¡vÃ¡nÃ';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch koÅ¡Å¯';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smÄ›rovÃ¡nÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrÅ¯';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtÅ¯ externÃho zÃskÃ¡vÃ¡nÃ e-mailÅ¯';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta e-mailovÃ© schrÃ¡nky';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit pro e-mailovÃ© aliasy musÃ bÃ½t Ä
 $wb['limit_mailforward_error_notint'] = 'Limit pro e-mailovÃ© pÅ™edÃ¡vÃ¡nÃ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit pro e-mailovÃ© koÅ¡e musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit pro e-mailovÃ¡ smÄ›rovÃ¡nÃ musÃ bÃ½t ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit pro e-mailovÃ© filtry limit musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit pro externÃ zÃskÃ¡vÃ¡nÃ e-mailÅ¯ musÃ bÃ½t ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit pro e-mailovou kvÃ³tu musÃ bÃ½t ÄÃslo.';
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index ca22ce638c..cce0b03b68 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliase';
 $wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
 $wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
 $wb['limit_mailrouting_txt'] = 'Max. Anzahl an E-Mail Routen';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filter';
 $wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
 $wb['limit_mailquota_txt'] = 'E-Mail Konto BeschrÃ¤nkung';
@@ -64,6 +65,7 @@ $wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sei
 $wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitung Limit muss eine Zahl sein.';
 $wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
 $wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
 $wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Zahl sein.';
 $wb['limit_mailquota_error_notint'] = 'Das E-MailbeschrÃ¤nkungs Limit muss eine Zahl sein.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index a8431a8187..aaf26f9996 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliasse';
 $wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
 $wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
 $wb['limit_mailrouting_txt'] = 'Max. Anzahl E-Mail Routen';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filtern';
 $wb['limit_fetchmail_txt'] = 'Max. Anzahl an E-Mail Sammeldienst Konten';
 $wb['limit_mailquota_txt'] = 'E-Mail Konto BeschrÃ¤nkung';
@@ -34,6 +35,7 @@ $wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sei
 $wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitung Limit muss eine Zahl sein.';
 $wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
 $wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
 $wb['limit_mailfetchmail_error_notint'] = 'Das E-Mail Sammeldienst Limit muss eine Zahl sein.';
 $wb['limit_mailquota_error_notint'] = 'Das E-Mail BeschrÃ¤nkungs Limit muss eine Zahl sein.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Web-Server';
 $wb['db_servers_txt'] = 'Datenbank-Server';
 $wb['mail_servers_txt'] = 'Mail-Server';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index 9f68b18cf5..5d6a8f134f 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. Anzahl an E-Mail Aliasse';
 $wb['limit_mailforward_txt'] = 'Max. Anzahl an E-Mail Weiterleitungen';
 $wb['limit_mailcatchall_txt'] = 'Max. Anzahl an E-Mail Catchall Konten';
 $wb['limit_mailrouting_txt'] = 'Max. Anzahl an E-Mail Routen';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. Anzahl an E-Mail Filtern';
 $wb['limit_fetchmail_txt'] = 'Max. Anzahl an Fetchmail Konten';
 $wb['limit_mailquota_txt'] = 'E-Mail konten BeschrÃ¤nkung';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'Das E-Mail Alias Limit muss eine Zahl sei
 $wb['limit_mailforward_error_notint'] = 'Das E-Mail Weiterleitungs Limit muss eine Zahl sein.';
 $wb['limit_mailcatchall_error_notint'] = 'Das E-Mail Catchall Limit muss eine Zahl sein.';
 $wb['limit_mailrouting_error_notint'] = 'Das E-Mail Routing Limit muss eine Zahl sein.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Das E-Mail Filter Limit muss eine Zahl sein.';
 $wb['limit_mailfetchmail_error_notint'] = 'Das Fetchmail Limit muss eine Zahl sein.';
 $wb['limit_mailquota_error_notint'] = 'Das E-Mail BeschrÃ¤kungs Limit muss eine Zahl sein.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng
index b1e549dd91..fc83620acb 100644
--- a/interface/web/client/lib/lang/dk_client.lng
+++ b/interface/web/client/lib/lang/dk_client.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. antal af domÃ¦ne aliaser';
 $wb['limit_mailforward_txt'] = 'Max. antal af e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. antal af e-mail catchall konti';
 $wb['limit_mailrouting_txt'] = 'Max. antal af e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere';
 $wb['limit_fetchmail_txt'] = 'Max. antal af fetchmail konti';
 $wb['limit_mailquota_txt'] = 'Postboks kvota';
@@ -70,6 +71,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'E-mail domÃ¦ne alias grÃ¦nse skal v
 $wb['limit_mailforward_error_notint'] = 'E-mail forward grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailcatchall_error_notint'] = 'E-mail catchall grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailrouting_error_notint'] = 'E-mail routing grÃ¦nse skal vÃ¦re et tal.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-mail filter grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailfetchmail_error_notint'] = 'Fetchmail grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailquota_error_notint'] = 'E-mail kvote grÃ¦nse skal vÃ¦re et tal.';
@@ -202,4 +204,3 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng
index 04acf57d64..fa9399197f 100644
--- a/interface/web/client/lib/lang/dk_client_template.lng
+++ b/interface/web/client/lib/lang/dk_client_template.lng
@@ -11,6 +11,7 @@ $wb['limit_mailmailinglist_txt'] = 'Max. antal af mailing lister';
 $wb['limit_mailforward_txt'] = 'Max. antal af e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. antal af e-mail catchall konti';
 $wb['limit_mailrouting_txt'] = 'Max. antal af e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere';
 $wb['limit_fetchmail_txt'] = 'Max. antal af fetchmail konti';
 $wb['limit_mailquota_txt'] = 'Postboks kvota';
@@ -42,6 +43,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'E-mail domÃ¦ne alias grÃ¦nse skal v
 $wb['limit_mailforward_error_notint'] = 'E-mail forward grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailcatchall_error_notint'] = 'E-mail catchall grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailrouting_error_notint'] = 'E-mail routing grÃ¦nse skal vÃ¦re et tal.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-mail filter grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailfetchmail_error_notint'] = 'Fetchmail grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailquota_error_notint'] = 'E-mail kvote grÃ¦nse skal vÃ¦re et tal.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/dk_reseller.lng b/interface/web/client/lib/lang/dk_reseller.lng
index 12004df761..19babe52d4 100644
--- a/interface/web/client/lib/lang/dk_reseller.lng
+++ b/interface/web/client/lib/lang/dk_reseller.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. antal af domÃ¦ne aliaser';
 $wb['limit_mailforward_txt'] = 'Max. antal af e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. antal af e-mail catchall konti';
 $wb['limit_mailrouting_txt'] = 'Max. antal af e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere';
 $wb['limit_fetchmail_txt'] = 'Max. antal af fetchmail konti';
 $wb['limit_mailquota_txt'] = 'Postboks kvota';
@@ -69,6 +70,7 @@ $wb['limit_mailalias_error_notint'] = 'E-mail alias grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailforward_error_notint'] = 'E-mail forward grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailcatchall_error_notint'] = 'E-mail catchall grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailrouting_error_notint'] = 'E-mail routing grÃ¦nse skal vÃ¦re et tal.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-mail filter grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailfetchmail_error_notint'] = 'Fetchmail grÃ¦nse skal vÃ¦re et tal.';
 $wb['limit_mailquota_error_notint'] = 'E-mail kvote grÃ¦nse skal vÃ¦re et tal.';
@@ -206,4 +208,3 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 144e632ef6..3d61198d3d 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'ÎŒÏÎ¹Î¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½ domain';
 $wb['limit_mailforward_txt'] = 'ÎŒÏÎ¹Î¿ email forwarders';
 $wb['limit_mailcatchall_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ email catchall';
 $wb['limit_mailrouting_txt'] = 'ÎŒÏÎ¹Î¿ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ Ï„Ï‰Î½ email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÎŒÏÎ¹Î¿ Ï†Î¯Î»Ï„ÏÏ‰Î½ email';
 $wb['limit_fetchmail_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ fetchmail';
 $wb['limit_mailquota_txt'] = 'ÎŒÏÎ¹Î¿ Ï‡ÏŽÏÎ¿Ï… Î¸Ï…ÏÎ¯Î´Î±Ï‚';
@@ -70,6 +71,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ ÏˆÎµÏ…Î´Ï‰Î½Ï
 $wb['limit_mailforward_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ email forward Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
 $wb['limit_mailcatchall_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ email catchall Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
 $wb['limit_mailrouting_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ email filter Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
 $wb['limit_mailfetchmail_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ fetchmail Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
 $wb['limit_mailquota_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ Ï„Ï‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 91be0bcffd..7d05bd4cc8 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'ÎŒÏÎ¹Î¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½ domain';
 $wb['limit_mailforward_txt'] = 'ÎŒÏÎ¹Î¿ email forwarders';
 $wb['limit_mailcatchall_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ email';
 $wb['limit_mailrouting_txt'] = 'ÎŒÏÎ¹Î¿ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÎŒÏÎ¹Î¿ Ï†Î¯Î»Ï„ÏÏ‰Î½ email';
 $wb['limit_fetchmail_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ fetchmail';
 $wb['limit_mailquota_txt'] = 'ÎŒÏÎ¹Î¿ Î¸Ï…ÏÎ¯Î´Î±Ï‚';
@@ -39,6 +40,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½
 $wb['limit_mailforward_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ email forward Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailcatchall_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ email catchall Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailrouting_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailfetchmail_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ fetchmail Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailquota_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï‡ÏŽÏÎ¿Ï… email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 3a5e5159aa..9aa37a6333 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ÎŒÏÎ¹Î¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½ email';
 $wb['limit_mailforward_txt'] = 'ÎŒÏÎ¹Î¿ email forwarders';
 $wb['limit_mailcatchall_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ email catchall';
 $wb['limit_mailrouting_txt'] = 'ÎŒÏÎ¹Î¿ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÎŒÏÎ¹Î¿ Ï†Î¯Î»Ï„ÏÏ‰Î½ email';
 $wb['limit_fetchmail_txt'] = 'ÎŒÏÎ¹Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ fetchmail';
 $wb['limit_mailquota_txt'] = 'ÎŒÏÎ¹Î¿ Î¸Ï…ÏÎ¯Î´Î±Ï‚';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ ÏˆÎµÏ…Î´Ï‰Î½ÏÎ¼Ï‰Î½ email
 $wb['limit_mailforward_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ email forward Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailcatchall_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ email catchall Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailrouting_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÏ‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailfetchmail_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ fetchmail Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
 $wb['limit_mailquota_error_notint'] = 'Î¤Î¿ ÏŒÏÎ¹Î¿ Ï‡ÏŽÏÎ¿Ï… email Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index a5991260c5..ee5f3675bd 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -73,6 +74,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -204,4 +206,3 @@ $wb['email_error_empty'] = 'Email is empty';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
index aa3dfdcb6e..bfccedcf1e 100644
--- a/interface/web/client/lib/lang/en_client_template.lng
+++ b/interface/web/client/lib/lang/en_client_template.lng
@@ -12,6 +12,7 @@ $wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -47,6 +48,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -125,4 +127,3 @@ $wb['xmpp_servers_txt'] = 'XMPP Servers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index ec94cb0178..c2315c67b4 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -73,6 +74,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -210,4 +212,3 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index eae85315b6..645a533a51 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -105,6 +105,8 @@ $wb['limit_mailquota_error_notint'] = 'El lÃmite de cuota de correo debe ser un
 $wb['limit_mailquota_txt'] = 'Cuota de buzones de correo';
 $wb['limit_mailrouting_error_notint'] = 'El lÃmite de enrutadores de correo debe ser un nÃºmero.';
 $wb['limit_mailrouting_txt'] = 'Cantidad mÃ¡x. de enrutadores de correos';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_openvz_vm_error_notint'] = 'El lÃmite de servidores virtuales debe ser un nÃºmero.';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forzar plantilla para servidor virtual';
 $wb['limit_openvz_vm_txt'] = 'Cantidad mÃ¡xima de servidores virtuales';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index 5c55b23f89..17c73de969 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -62,6 +62,8 @@ $wb['limit_mailquota_error_notint'] = 'El lÃmite de cuota de correo debe ser un
 $wb['limit_mailquota_txt'] = 'Cuota de buzones de correo';
 $wb['limit_mailrouting_error_notint'] = 'El lÃmite de enrutadores de correo debe ser un nÃºmero.';
 $wb['limit_mailrouting_txt'] = 'Cantidad mÃ¡x. de enrutadores de correos';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_openvz_vm_error_notint'] = 'El lÃmite del servidor virtual debe ser un nÃºmero.';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forzar plantilla de servidor virtual';
 $wb['limit_openvz_vm_txt'] = 'Cantidad mÃ¡x. de servidores virtuales';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 6830c56cb8..d2553ce83c 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -112,6 +112,8 @@ $wb['limit_mailquota_error_notint'] = 'El lÃmite de cuota de correo debe ser un
 $wb['limit_mailquota_txt'] = 'Cuota de buzones de correo';
 $wb['limit_mailrouting_error_notint'] = 'El lÃmite de enrutadores de correo debe ser un nÃºmero.';
 $wb['limit_mailrouting_txt'] = 'Cantidad mÃ¡x. de enrutadores de correos';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_openvz_vm_error_notint'] = 'El lÃmite del servidor virtual debe ser un nÃºmero.';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forzar plantilla de servidor virtual';
 $wb['limit_openvz_vm_txt'] = 'Cantidad mÃ¡x. de servidores virtuales';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 7769af8b99..c0c0a5ba3a 100644
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Postisoitteiden aliastunnuksien mÃ¤Ã¤rÃ¤';
 $wb['limit_mailforward_txt'] = 'EdelleenlÃ¤hetysosoitteiden mÃ¤Ã¤rÃ¤';
 $wb['limit_mailcatchall_txt'] = 'Postiverkkotunnuksien Catchall-tilien mÃ¤Ã¤rÃ¤';
 $wb['limit_mailrouting_txt'] = 'Postireititysten mÃ¤Ã¤rÃ¤';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Roskapostisuodattimien mÃ¤Ã¤rÃ¤';
 $wb['limit_fetchmail_txt'] = 'Noudettavien postilaatikoiden mÃ¤Ã¤rÃ¤';
 $wb['limit_mailquota_txt'] = 'Postilaatikon enimmÃ¤iskoko';
@@ -62,6 +63,7 @@ $wb['limit_mailalias_error_notint'] = 'Postin aliastunnuksien raja-arvon pitÃ¤Ã¤
 $wb['limit_mailforward_error_notint'] = 'Postin edelleenlÃ¤hetysten raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailcatchall_error_notint'] = 'Postiverkkotunnuksien catchall-tunnuksien raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailrouting_error_notint'] = 'Postireititysten raja-arvon pitÃ¤Ã¤ olla numero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Roskapostisuodattimien raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailfetchmail_error_notint'] = 'Noudettavien postilaatikoiden raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailquota_error_notint'] = 'Postilaatikon koon raja-arvon pitÃ¤Ã¤ olla numero.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index 70d9069664..d24182806b 100644
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Postialiaksien mÃ¤Ã¤rÃ¤';
 $wb['limit_mailforward_txt'] = 'EdelleenlÃ¤hetysosoitteiden mÃ¤Ã¤rÃ¤';
 $wb['limit_mailcatchall_txt'] = 'Postiverkkotunnuksien Catchall-tilien mÃ¤Ã¤rÃ¤';
 $wb['limit_mailrouting_txt'] = 'Postireititysten mÃ¤Ã¤rÃ¤';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Roskapostisuodattimien mÃ¤Ã¤rÃ¤';
 $wb['limit_fetchmail_txt'] = 'Noudettavien postilaatikoiden mÃ¤Ã¤rÃ¤';
 $wb['limit_mailquota_txt'] = 'Postilaatikon koko';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'Postialiaksien raja-arvon pitÃ¤Ã¤ olla nu
 $wb['limit_mailforward_error_notint'] = 'EdelleenlÃ¤hetysosoitteiden raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailcatchall_error_notint'] = 'Catchall-tunnuksien raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailrouting_error_notint'] = 'Postireitityksien raja-arvon pitÃ¤Ã¤ olla numero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Roskapostisuodattimien raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailfetchmail_error_notint'] = 'Noudettavien postilaatikoiden raja-arvon pitÃ¤Ã¤ olla numero.';
 $wb['limit_mailquota_error_notint'] = 'Postilaatikon koon raja-arvon pitÃ¤Ã¤ olla numero.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index fbd09f4b3e..06e2ef5fca 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'SÃ¤hkÃ¶postin aliastunnuksien enimmÃ¤ismÃ¤Ã¤rÃ¤';
 $wb['limit_mailforward_txt'] = 'EdelleenlÃ¤hetettÃ¤vien sÃ¤hkÃ¶postitunnuksien enimmÃ¤ismÃ¤Ã¤rÃ¤';
 $wb['limit_mailcatchall_txt'] = 'SÃ¤hkÃ¶postin catchall-tilien enimmÃ¤ismÃ¤Ã¤rÃ¤';
 $wb['limit_mailrouting_txt'] = 'SÃ¤hkÃ¶postireitityksien enimmÃ¤ismÃ¤Ã¤rÃ¤';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'SÃ¤hkÃ¶postisuodattimien enimmÃ¤ismÃ¤Ã¤rÃ¤';
 $wb['limit_fetchmail_txt'] = 'Noudettavien sÃ¤hkÃ¶potilaatikoiden enimmÃ¤ismÃ¤Ã¤rÃ¤';
 $wb['limit_mailquota_txt'] = 'SÃ¤hkÃ¶postilaatikoiden levytila';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'SÃ¤hkÃ¶postialiaksien rajan pitÃ¤Ã¤ olla
 $wb['limit_mailforward_error_notint'] = 'SÃ¤hkÃ¶postin edelleenlÃ¤hetyksen rajan pitÃ¤Ã¤ olla numeerinen.';
 $wb['limit_mailcatchall_error_notint'] = 'Catchall-tunnuksien rajan pitÃ¤Ã¤ olla numeerinen.';
 $wb['limit_mailrouting_error_notint'] = 'SÃ¤hkÃ¶postireittien rajan pitÃ¤Ã¤ olla numeerinen.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'SÃ¤hkÃ¶postisuodattimien rajan pitÃ¤Ã¤ olla numeerinen.';
 $wb['limit_mailfetchmail_error_notint'] = 'Noudettavien laatikoiden rajan pitÃ¤Ã¤ olla numeerinen.';
 $wb['limit_mailquota_error_notint'] = 'SÃ¤hkÃ¶postin levytilan rajan pitÃ¤Ã¤ olla numeerinen.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index c3de724d93..4ef9a64eeb 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal dâ€™alias dâ€™e-mail';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs dâ€™e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes dâ€™e-mail';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres dâ€™e-mails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur e-mail';
 $wb['limit_mailquota_txt'] = 'Quota des boÃ®tes aux lettres';
@@ -61,6 +62,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite dâ€™alias dâ€™e-mail doit Ãªtre
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes dâ€™e-mail doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur e-mail doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boÃ®tes dâ€™e-mail doit Ãªtre un nombre.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index b81788c0d4..e443eb7801 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal dâ€™alias dâ€™e-mail';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs dâ€™e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes dâ€™e-mails';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres dâ€™e-mails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur e-mail';
 $wb['limit_mailquota_txt'] = 'Quota des boÃ®tes aux lettres';
@@ -31,6 +32,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite dâ€™alias dâ€™e-mail doit Ãªtre
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes dâ€™e-mail doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur e-mail doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boÃ®tes dâ€™e-mail doit Ãªtre un nombre.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 76d44cb324..448a91ea39 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Nombre maximal dâ€™alias dâ€™e-mail';
 $wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs dâ€™e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
 $wb['limit_mailrouting_txt'] = 'Nombre maximal de routes dâ€™e-mails';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres dâ€™e-mails';
 $wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes rÃ©cupÃ©rateur e-mail';
 $wb['limit_mailquota_txt'] = 'Quota des boÃ®tes aux lettres';
@@ -64,6 +65,7 @@ $wb['limit_mailalias_error_notint'] = 'La limite dâ€™alias dâ€™e-mail doit Ãªtre
 $wb['limit_mailforward_error_notint'] = 'La limite de routeurs dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit Ãªtre un nombre.';
 $wb['limit_mailrouting_error_notint'] = 'La limite de routes dâ€™e-mail doit Ãªtre un nombre.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'La limite de filtres dâ€™e-mail doit Ãªtre un nombre.';
 $wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes rÃ©cupÃ©rateur e-mail doit Ãªtre un nombre.';
 $wb['limit_mailquota_error_notint'] = 'La limite du quota des boÃ®tes dâ€™e-mail doit Ãªtre un nombre.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 4d16bac0cb..aac50a2f2a 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
 $wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
 $wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall raÄuna';
 $wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
 $wb['limit_fetchmail_txt'] = 'Maksimalan broj fetchmail raÄuna';
 $wb['limit_mailquota_txt'] = 'VeliÄina mailboxa';
@@ -70,6 +71,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Maksimalan broj email alias domena
 $wb['limit_mailforward_error_notint'] = 'Limit email forwarda mora biti znamenka.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit email catchalla mora biti znamenka.';
 $wb['limit_mailrouting_error_notint'] = 'Limit email ruta mora biti znamenka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filtera mora biti znamenka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmaila mora biti znamenka.';
 $wb['limit_mailquota_error_notint'] = 'VeliÄina mailboxa mora biti znamenka.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index 12fabbe723..4a2cd0500c 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
 $wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
 $wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall raÄuna';
 $wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
 $wb['limit_fetchmail_txt'] = 'Maksimalan broj fetchmail raÄuna';
 $wb['limit_mailquota_txt'] = 'VeliÄina mailboxa';
@@ -39,6 +40,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Maksimalan broj email alias domena
 $wb['limit_mailforward_error_notint'] = 'Limit email forwarda mora biti znamenka.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit email catchalla mora biti znamenka.';
 $wb['limit_mailrouting_error_notint'] = 'Limit email ruta mora biti znamenka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filtera mora biti znamenka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmaila mora biti znamenka.';
 $wb['limit_mailquota_error_notint'] = 'VeliÄina mailboxa mora biti znamenka.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index d4b9f58eeb..9b01f30b2d 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Maksimalan broj aliasa email domena';
 $wb['limit_mailforward_txt'] = 'Maksimalan broj email forwardera';
 $wb['limit_mailcatchall_txt'] = 'Maksimalan broj email catchall raÄuna';
 $wb['limit_mailrouting_txt'] = 'Maksimalan broj email ruta';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksimalan broj email filtera';
 $wb['limit_fetchmail_txt'] = 'Maksimalan broj fetchmail raÄuna';
 $wb['limit_mailquota_txt'] = 'VeliÄina mailboxa';
@@ -69,6 +70,7 @@ $wb['limit_mailalias_error_notint'] = 'Maksimalan broj email aliasa mora biti zn
 $wb['limit_mailforward_error_notint'] = 'Limit email forwarda mora biti znamenka.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit email catchalla mora biti znamenka.';
 $wb['limit_mailrouting_error_notint'] = 'Limit email ruta mora biti znamenka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filtera mora biti znamenka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmaila mora biti znamenka.';
 $wb['limit_mailquota_error_notint'] = 'VeliÄina mailboxa mora biti znamenka.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index b11e03273e..402e5adf04 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'MaximÃ¡lisan lÃ©trehozhatÃ³ email alias-ok szÃ¡ma'
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox korlÃ¡t';
@@ -62,6 +63,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index 3df432a661..9300d945b6 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index 76755a112b..5970b80d46 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index df858ebdfa..c7b5cafa43 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Jumlah maks alias domain';
 $wb['limit_mailforward_txt'] = 'Jumlah maks forwarder email';
 $wb['limit_mailcatchall_txt'] = 'Jumlah maks akun catchall email';
 $wb['limit_mailrouting_txt'] = 'Jumlah maks rute email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks penyaringan email';
 $wb['limit_fetchmail_txt'] = 'Jumlah maks akun fetchmail';
 $wb['limit_mailquota_txt'] = 'Kuota Mailbox';
@@ -67,6 +68,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Batasan alias domain email harus be
 $wb['limit_mailforward_error_notint'] = 'Batasan forward email harus berupa angka.';
 $wb['limit_mailcatchall_error_notint'] = 'Batasan catchall email harus berupa angka.';
 $wb['limit_mailrouting_error_notint'] = 'Batasan routing email harus berupa angka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Batasan penyaringan email harus berupa angka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Batasan fetchmail harus berupa angka.';
 $wb['limit_mailquota_error_notint'] = 'Batasan kuota email harus berupa angka.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 57c55be576..007b4af0da 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Jumlah maks alias domain';
 $wb['limit_mailforward_txt'] = 'Jumlah maks forwarder email';
 $wb['limit_mailcatchall_txt'] = 'Jumlah maks akun catchall email';
 $wb['limit_mailrouting_txt'] = 'Jumlah maks rute email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks filter email';
 $wb['limit_fetchmail_txt'] = 'Jumlah maks akun fetchmail';
 $wb['limit_mailquota_txt'] = 'Kuota Mailbox';
@@ -36,6 +37,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Batasan alias domain email harus be
 $wb['limit_mailforward_error_notint'] = 'Batasan forward email harus berupa angka.';
 $wb['limit_mailcatchall_error_notint'] = 'Batasan catchall email harus berupa angka.';
 $wb['limit_mailrouting_error_notint'] = 'Batasan routing email harus berupa angka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Batasan penyaringan email harus berupa angka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Batasan fetchmail harus berupa angka.';
 $wb['limit_mailquota_error_notint'] = 'Batasan kuota email harus berupa angka.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index e639f4929e..11b0d95d74 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Jumlah maks alias email';
 $wb['limit_mailforward_txt'] = 'Jumlah maks forwarder email';
 $wb['limit_mailcatchall_txt'] = 'Jumlah maks akun catchall email';
 $wb['limit_mailrouting_txt'] = 'Jumlah maks rute email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks penyaringan email';
 $wb['limit_fetchmail_txt'] = 'Jumlah maks akun fetchmail';
 $wb['limit_mailquota_txt'] = 'Kuota Mailbox';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'Batasan alias email harus berupa angka.';
 $wb['limit_mailforward_error_notint'] = 'Batasan forward email harus berupa angka.';
 $wb['limit_mailcatchall_error_notint'] = 'Batasan catchall email harus berupa angka.';
 $wb['limit_mailrouting_error_notint'] = 'Batasan routing email harus berupa angka.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Batasan penyaringan email harus berupa angka.';
 $wb['limit_mailfetchmail_error_notint'] = 'Batasan fetchmail harus berupa angka.';
 $wb['limit_mailquota_error_notint'] = 'Batasan kuota email harus berupa angka.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 8442ace734..6ad3f11a20 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Numero massimo di aliases di posta';
 $wb['limit_mailforward_txt'] = 'Numero massimo di forwarders di posta';
 $wb['limit_mailcatchall_txt'] = 'Numero massimo di catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Numero massimo di email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Numero massimo di email filters';
 $wb['limit_fetchmail_txt'] = 'Numero massimo di fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Limite quota mailbox';
@@ -61,6 +62,7 @@ $wb['limit_mailalias_error_notint'] = 'Il limite di email alias deve essere un n
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index 40ef74de16..bc1f90052a 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Num. massimo alias email';
 $wb['limit_mailforward_txt'] = 'Num. massimo inoltri email';
 $wb['limit_mailcatchall_txt'] = 'Num. massimo account email catchall';
 $wb['limit_mailrouting_txt'] = 'Num. massimo routes email';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Num. massimo filtri email';
 $wb['limit_fetchmail_txt'] = 'Num. massimo account fetchmail';
 $wb['limit_mailquota_txt'] = 'Quota caselle di posta';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'Il limite alias email devessere un numero
 $wb['limit_mailforward_error_notint'] = 'Il limite inoltro email devessere un numero.';
 $wb['limit_mailcatchall_error_notint'] = 'Il limite catchall email devessere un numero.';
 $wb['limit_mailrouting_error_notint'] = 'Il limite routing email devessere un numero .';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Il limite filtri email devessere un numero.';
 $wb['limit_mailfetchmail_error_notint'] = 'Il limite fetchmail devessere un numero.';
 $wb['limit_mailquota_error_notint'] = 'Il limite quota email devessere un numero.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index 8b5d719427..a90a2d8078 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index de4642d72d..be88a575cd 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°';
 $wb['limit_mailforward_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°';
 $wb['limit_mailcatchall_txt'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailrouting_txt'] = 'ãƒ¡ãƒ¼ãƒ«é…é€çµŒè·¯ã®æœ€å¤§æ•°';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°';
 $wb['limit_fetchmail_txt'] = 'fetchmailã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailquota_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®å®¹é‡';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°ã¯
 $wb['limit_mailforward_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailcatchall_error_notint'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailrouting_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã®é…é€çµŒè·¯ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailfetchmail_error_notint'] = 'fetchmailã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailquota_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®æœ€å¤§å®¹é‡ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index 7381465d66..ca83bda97a 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°';
 $wb['limit_mailforward_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°';
 $wb['limit_mailcatchall_txt'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailrouting_txt'] = 'ãƒ¡ãƒ¼ãƒ«é…é€çµŒè·¯ã®æœ€å¤§æ•°';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°';
 $wb['limit_fetchmail_txt'] = 'fetchmailã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailquota_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®å®¹é‡';
@@ -35,6 +36,7 @@ $wb['limit_mailalias_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°ã¯
 $wb['limit_mailforward_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailcatchall_error_notint'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailrouting_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã®é…é€çµŒè·¯ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailfetchmail_error_notint'] = 'fetchmailã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailquota_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®æœ€å¤§å®¹é‡ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index a4df95b8b9..1b89262493 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°';
 $wb['limit_mailforward_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°';
 $wb['limit_mailcatchall_txt'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailrouting_txt'] = 'ãƒ¡ãƒ¼ãƒ«é…é€çµŒè·¯ã®æœ€å¤§æ•°';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°';
 $wb['limit_fetchmail_txt'] = 'Fetchmail ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°';
 $wb['limit_mailquota_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®å®¹é‡';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã®æœ€å¤§æ•°ã¯
 $wb['limit_mailforward_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailcatchall_error_notint'] = 'ã‚ãƒ£ãƒƒãƒã‚ªãƒ¼ãƒ«ãƒ»ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailrouting_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ã®é…é€çµŒè·¯ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailfetchmail_error_notint'] = 'fetchmailã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®æœ€å¤§æ•°ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
 $wb['limit_mailquota_error_notint'] = 'ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã®æœ€å¤§å®¹é‡ã¯æ•°å—ã§æŒ‡å®šã—ã¦ãã ã•ã„ã€‚';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index cd9f6e1742..1f4e5d70a1 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliassen';
 $wb['limit_mailforward_txt'] = 'Max. aantal e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. aantal email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. aantal e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. aantal e-mail filters';
 $wb['limit_fetchmail_txt'] = 'Max. aantal fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -71,6 +72,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'De e-mail domein alias limiet moet
 $wb['limit_mailforward_error_notint'] = 'De e-mail forward limiet moet een numerieke waarde zijn.';
 $wb['limit_mailcatchall_error_notint'] = 'De e-mail catchall limiet moet een numerieke waarde zijn.';
 $wb['limit_mailrouting_error_notint'] = 'De em-ail routing limiet moet een numerieke waarde zijn.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'De e-mail filter limiet moet een numerieke waarde zijn.';
 $wb['limit_mailfetchmail_error_notint'] = 'De fetchmail limiet moet een numerieke waarde zijn.';
 $wb['limit_mailquota_error_notint'] = 'De e-mail quota limiet moet een numerieke waarde zijn.';
@@ -202,4 +204,3 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index da4721757d..423b4d7b94 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. aantal domein aliassen';
 $wb['limit_mailforward_txt'] = 'Max.aantal e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. aantal e-mail catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. aantal e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. aantal e-mail filters';
 $wb['limit_fetchmail_txt'] = 'Max. aantal fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -39,6 +40,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'De e-mail domain alias limiet moet
 $wb['limit_mailforward_error_notint'] = 'De e-mail forward limiet moet een numerieke waarde zijn.';
 $wb['limit_mailcatchall_error_notint'] = 'De e-mail catchall limiet moet een numerieke waarde zijn.';
 $wb['limit_mailrouting_error_notint'] = 'De e-mail routing limiet moet een numerieke waarde zijn.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'De e-mail filter limiet moet een numerieke waarde zijn.';
 $wb['limit_mailfetchmail_error_notint'] = 'De fetchmail limiet moet een numerieke waarde zijn.';
 $wb['limit_mailquota_error_notint'] = 'De e-mail quota limiet moet een numerieke waarde zijn.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index e8df5f7ad8..637dddc65d 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. aantal e-mail aliassen';
 $wb['limit_mailforward_txt'] = 'Max. aantal e-mail forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. aantal e-mail catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. aantal e-mail routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. aantal e-mail filters';
 $wb['limit_fetchmail_txt'] = 'Max. aantal fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -67,6 +68,7 @@ $wb['limit_mailalias_error_notint'] = 'De e-mail alias limiet moet een numerieke
 $wb['limit_mailforward_error_notint'] = 'De e-mail forward limiet moet een numerieke waarde zijn.';
 $wb['limit_mailcatchall_error_notint'] = 'De e-mail catchall limiet moet een numerieke waarde zijn.';
 $wb['limit_mailrouting_error_notint'] = 'De e-mail routing limiet moet een numerieke waarde zijn.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'De e-mail filter limiet moet een numerieke waarde zijn.';
 $wb['limit_mailfetchmail_error_notint'] = 'De fetchmail limiet moet een numerieke waarde zijn.';
 $wb['limit_mailquota_error_notint'] = 'De email quota limiet moet een numerieke waarde zijn.';
@@ -206,4 +208,3 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 89fafa6776..c040e787ae 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Maksymalna iloÅ›Ä‡ aliasÃ³w e-mail';
 $wb['limit_mailforward_txt'] = 'Maksymalna iloÅ›Ä‡ przekierowaÅ„ e-mail';
 $wb['limit_mailcatchall_txt'] = 'Maksymalna iloÅ›Ä‡ kont e-mail catchall';
 $wb['limit_mailrouting_txt'] = 'Maksymalna iloÅ›Ä‡ Å›cieÅ¼ek e-mail';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksymalna iloÅ›Ä‡ filtrÃ³w e-mail';
 $wb['limit_fetchmail_txt'] = 'Maksymalna iloÅ›Ä‡ kont z fetchmail';
 $wb['limit_mailquota_txt'] = 'PojemnoÅ›Ä‡ skrzynki';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit aliasÃ³w e-mail musi byÄ‡ liczbÄ….'
 $wb['limit_mailforward_error_notint'] = 'Limit przekierowaÅ„ musi byÄ‡ liczbÄ….';
 $wb['limit_mailcatchall_error_notint'] = 'Limit e-mail catchall musi byÄ‡ liczbÄ….';
 $wb['limit_mailrouting_error_notint'] = 'Limit Å›cieÅ¼ek e-mail musi byÄ‡ liczbÄ….';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit filtrÃ³w e-mail musi byÄ‡ liczbÄ….';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musi byÄ‡ liczbÄ….';
 $wb['limit_mailquota_error_notint'] = 'Limit pojemnoÅ›ci skrzynki musi byÄ‡ liczbÄ….';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index 3a878ec974..5945310d0c 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Maksymalna iloÅ›Ä‡ aliasÃ³w e-mail';
 $wb['limit_mailforward_txt'] = 'Maksymalna iloÅ›Ä‡ przekierowaÅ„ e-mail';
 $wb['limit_mailcatchall_txt'] = 'Maksymalna iloÅ›Ä‡ kont e-mail catchall';
 $wb['limit_mailrouting_txt'] = 'Maksymalna iloÅ›Ä‡ Å›cieÅ¼ek e-mail';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksymalna iloÅ›Ä‡ filtrÃ³w e-mail';
 $wb['limit_fetchmail_txt'] = 'Maksymalna iloÅ›Ä‡ kont z fetchmail';
 $wb['limit_mailquota_txt'] = 'PojemnoÅ›Ä‡ skrzynki';
@@ -35,6 +36,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit aliasÃ³w musi byÄ‡ liczbÄ….';
 $wb['limit_mailforward_error_notint'] = 'Limit przekierowaÅ„ e-mail musi byÄ‡ liczbÄ….';
 $wb['limit_mailcatchall_error_notint'] = 'Limit e-mail catchall musi byÄ‡ liczbÄ….';
 $wb['limit_mailrouting_error_notint'] = 'Limit Å›cieÅ¼ek e-mail musi byÄ‡ liczbÄ….';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit filtrÃ³w e-mail musi byÄ‡ liczbÄ….';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musi byÄ‡ liczbÄ….';
 $wb['limit_mailquota_error_notint'] = 'Limit pojemnoÅ›ci skrzynki musi byÄ‡ liczbÄ….';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 71f5bcfa4b..2762ebc15b 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Maksymalna iloÅ›Ä‡ aliasÃ³w e-mail';
 $wb['limit_mailforward_txt'] = 'Maksymalna iloÅ›Ä‡ przekierowaÅ„ e-mail';
 $wb['limit_mailcatchall_txt'] = 'Maksymalna iloÅ›Ä‡ kont e-mail catchall';
 $wb['limit_mailrouting_txt'] = 'Maksymalna iloÅ›Ä‡ Å›cieÅ¼ek e-mail';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Maksymalna iloÅ›Ä‡ filtrÃ³w e-mail';
 $wb['limit_fetchmail_txt'] = 'Maksymalna iloÅ›Ä‡ kont fetchmail';
 $wb['limit_mailquota_txt'] = 'Limit skrzynki pocztowej';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit aliasÃ³w e-mail musi byÄ‡ liczbÄ….'
 $wb['limit_mailforward_error_notint'] = 'Limit przekierowaÅ„ e-mail musi byÄ‡ liczbÄ….';
 $wb['limit_mailcatchall_error_notint'] = 'Limit kont e-mail catchall musi byÄ‡ liczbÄ….';
 $wb['limit_mailrouting_error_notint'] = 'Limit Å›cieÅ¼ek e-mail musi byÄ‡ liczbÄ….';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit filtrÃ³w e-mail musi byÄ‡ liczbÄ….';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit kont fetchmail musi byÄ‡ liczbÄ….';
 $wb['limit_mailquota_error_notint'] = 'Limit pojemnoÅ›ci konta e-mail musi byÄ‡ liczbÄ….';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 9ce35235cd..8ce7235079 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'NÃºmero mÃ¡ximo de aliases de correio';
 $wb['limit_mailforward_txt'] = 'NÃºmero mÃ¡ximo de redireccionamento de correio';
 $wb['limit_mailcatchall_txt'] = 'NÃºmero mÃ¡ximo de catchall de correio';
 $wb['limit_mailrouting_txt'] = 'NÃºmero mÃ¡ximo de rotas de correio';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'NÃºmero mÃ¡ximo de filtros de correio';
 $wb['limit_fetchmail_txt'] = 'NÃºmero mÃ¡ximo de fetchmail de correio';
 $wb['limit_mailquota_txt'] = 'Quota de Correio';
@@ -63,6 +64,7 @@ $wb['limit_mailalias_error_notint'] = 'Limite do alias de correio deve ser um n
 $wb['limit_mailforward_error_notint'] = 'Limite de redireccionamento de correio deve ser um nÃºmero';
 $wb['limit_mailcatchall_error_notint'] = 'Limite de catchall deve ser um nÃºmero.';
 $wb['limit_mailrouting_error_notint'] = 'Limite de rotas de correio deve ser um nÃºmero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limite de filtros de correio deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limite de fetchmail deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'A quota de correio deve ser um nÃºmero';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index 0c4a949d49..b774a8c410 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Limite MÃ¡ximo de alias de correio';
 $wb['limit_mailforward_txt'] = 'Limite MÃ¡ximo de redireccionamentos de correio';
 $wb['limit_mailcatchall_txt'] = 'Limite mÃ¡ximo de contas catchall';
 $wb['limit_mailrouting_txt'] = 'Limite mÃ¡ximo de rotas de Correio';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'NÃºmero MÃ¡ximo de Filtros de Correio';
 $wb['limit_fetchmail_txt'] = 'NÃºmero MÃ¡ximo de Contas fetchmail';
 $wb['limit_mailquota_txt'] = 'EspaÃ§o de Caixa de Correio';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'O limite do apelido de correio deve ser n
 $wb['limit_mailforward_error_notint'] = 'O limite de direccionamento de correio deve ser um nÃºmero';
 $wb['limit_mailcatchall_error_notint'] = 'O limite de catchall do domÃnio deve ser um nÃºmero';
 $wb['limit_mailrouting_error_notint'] = 'Limite de rota de correio deve ser um nÃºmero';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'O limite de filtro de correio deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limite fetchmail deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'Cota de correio deve ser um nÃºmero.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 6bd89a971a..965a446ffb 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'NÃºmero mÃ¡ximo de aliases de correio';
 $wb['limit_mailforward_txt'] = 'NÃºmero mÃ¡ximo de encaminhamentos de correio';
 $wb['limit_mailcatchall_txt'] = 'NÃºmero mÃ¡ximo de contas catchall';
 $wb['limit_mailrouting_txt'] = 'NÃºmero mÃ¡ximo de rotas de correio';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'NÃºmero mÃ¡ximo de filtros de correio';
 $wb['limit_fetchmail_txt'] = 'NÃºmero mÃ¡ximo de contas fetchmail ';
 $wb['limit_mailquota_txt'] = 'Quota de correio';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'O limite de aliases de correio deve ser u
 $wb['limit_mailforward_error_notint'] = 'O limite de encaminhamentos de correio deve ser um nÃºmero.';
 $wb['limit_mailcatchall_error_notint'] = 'O limite de contas catchall deve ser um nÃºmero.';
 $wb['limit_mailrouting_error_notint'] = 'O limite de rotas de correio deve ser um nÃºmero.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'O filtro de correio deve ser um nÃºmero.';
 $wb['limit_mailfetchmail_error_notint'] = 'O limite de fetchmail deve ser um nÃºmero.';
 $wb['limit_mailquota_error_notint'] = 'O limite de quota de correio deve ser um nÃºmero.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 3bc5e59d2a..5ee1d8aaf6 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Numar maxim de  email alias-uri';
 $wb['limit_mailforward_txt'] = 'Numar maxim de mail forward';
 $wb['limit_mailcatchall_txt'] = 'numar maxim de mail catch all';
 $wb['limit_mailrouting_txt'] = 'Numar maxim de mail rute';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Numar maxim de filtre mail';
 $wb['limit_fetchmail_txt'] = 'Numar maxim de conturi fetchmail';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -63,6 +64,7 @@ $wb['limit_mailalias_error_notint'] = 'Numarul maxim de alias-uri email trebuie
 $wb['limit_mailforward_error_notint'] = 'Numarul limta de forward-uri email trebuie sa fie un numar intreg';
 $wb['limit_mailcatchall_error_notint'] = 'numarul limta de email catch all trebuie sa fie un numar intreg';
 $wb['limit_mailrouting_error_notint'] = 'numarul maxim de rute email trebuie sa fie un numar intreg';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'numarul maxim de filtre email trebuie sa fie un numar intreg';
 $wb['limit_mailfetchmail_error_notint'] = 'numarul maxim de fetchmail trebuie sa fie un numar intreg';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index 57cbe690dd..65e110c2ab 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index 512bc5cb23..afd557ab18 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 080512f5b0..70456bd255 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°
 $wb['limit_mailforward_txt'] = 'ÐœÐ°ÐºÑ.Ñ‡Ð¸ÑÐ¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº';
 $wb['limit_mailcatchall_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð²';
 $wb['limit_mailrouting_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð²';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²';
 $wb['limit_fetchmail_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹';
 $wb['limit_mailquota_txt'] = 'ÐšÐ²Ð¾Ñ‚Ð° Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð³Ð¾ ÑÑ‰Ð¸ÐºÐ°';
@@ -62,6 +63,7 @@ $wb['limit_mailalias_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°Ð»Ð¸Ð°ÑÐ¾
 $wb['limit_mailforward_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailcatchall_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailrouting_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailfetchmail_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailquota_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¹ ÐºÐ²Ð¾Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'ÐšÐ»Ð¸Ðº Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸';
 $wb['limit_dns_record_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ñ‹Ñ… DNS-Ð·Ð¾Ð½ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚Ñ‹';
-?>
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index 46168e1ad5..e540984824 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°
 $wb['limit_mailforward_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº';
 $wb['limit_mailcatchall_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð²';
 $wb['limit_mailrouting_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð²';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²';
 $wb['limit_fetchmail_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹';
 $wb['limit_mailquota_txt'] = 'ÐšÐ²Ð¾Ñ‚Ð° Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð³Ð¾ ÑÑ‰Ð¸ÐºÐ°';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°Ð»Ð¸Ð°ÑÐ¾
 $wb['limit_mailforward_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailcatchall_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailrouting_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailfetchmail_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailquota_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¹ ÐºÐ²Ð¾Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Web-ÑÐµÑ€Ð²ÐµÑ€Ñ‹';
 $wb['db_servers_txt'] = 'Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹ Ð±Ð°Ð· Ð´Ð°Ð½Ð½Ñ‹Ñ…';
 $wb['mail_servers_txt'] = 'Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹';
 $wb['Limits'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚Ñ‹';
-?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index f5806377c3..4b90d0347a 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°
 $wb['limit_mailforward_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº';
 $wb['limit_mailcatchall_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð²';
 $wb['limit_mailrouting_txt'] = 'ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð²';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²';
 $wb['limit_fetchmail_txt'] = 'ÐœÐ°ÐºÑ. ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹';
 $wb['limit_mailquota_txt'] = 'ÐšÐ²Ð¾Ñ‚Ð° ÑÑ‰Ð¸ÐºÐ°';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð°Ð»Ð¸Ð°ÑÐ¾
 $wb['limit_mailforward_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¿ÐµÑ€ÐµÑÑ‹Ð»Ð¾Ðº Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailcatchall_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ²Ð¾Ð´Ð½Ñ‹Ñ… Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailrouting_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð² Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
 $wb['limit_mailfetchmail_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ ÑÐ±Ð¾Ñ€Ñ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼Ð¼.';
 $wb['limit_mailquota_error_notint'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¹ ÐºÐ²Ð¾Ñ‚Ñ‹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'ÐšÐ»Ð¸Ðº Ð´Ð»Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Ð›Ð¸Ð¼Ð¸Ñ‚Ñ‹';
-?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index feaee0e9c1..bf585054cd 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max antal epostalias';
 $wb['limit_mailforward_txt'] = 'Max antal vidarebefordringar';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max antal epostrutter';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max antal epostfilter';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Kvot fÃ¶r epostkonton';
@@ -63,6 +64,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index 46932c9e50..c9001e42e2 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 512bc5cb23..afd557ab18 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
 $wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Max. number of email routes';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. number of email filters';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
 $wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
 $wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 542b4121d9..cfaced0561 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. poÄet e-mailovÃ½ch aliasov';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch preposielanÃ';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch domÃ©novÃ½ch koÅ¡ov';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smerovanÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrov';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtov fetchmail';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta schrÃ¡nky';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit  email alias musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailforward_error_notint'] = 'Limit email preposielanÃ musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit domÃ©novÃ½ch koÅ¡ov musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit email smerovanÃ musÃ byÅ¥ ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filter musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit email kvÃ³t musÃ byÅ¥ ÄÃslo.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index e3cb788bdd..9a602da093 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Max. poÄet e-mailovÃ½ch aliasov';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch prenose';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch domÃ©novÃ½ koÅ¡ov';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smerovanÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrov';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtov fetchmail';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta schrÃ¡nky';
@@ -34,6 +35,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit email aliasov musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailforward_error_notint'] = 'Limit emailpreposielanÃ musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit email domÃ©novÃ½ch koÅ¡ov musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit email smerovanÃ musÃ byÅ¥ ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filter musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit email kvÃ´ta musÃ byÅ¥ ÄÃslo.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
 $wb['db_servers_txt'] = 'Database servers';
 $wb['mail_servers_txt'] = 'Mailservers';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 82b289df2b..47dbd4f64c 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. poÄet e-mailovÃ½ch aliasov';
 $wb['limit_mailforward_txt'] = 'Max. poÄet e-mailovÃ½ch preposielanÃ';
 $wb['limit_mailcatchall_txt'] = 'Max. poÄet e-mailovÃ½ch domÃ©novÃ½ch koÅ¡ov';
 $wb['limit_mailrouting_txt'] = 'Max. poÄet e-mailovÃ½ch smerovanÃ';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrov';
 $wb['limit_fetchmail_txt'] = 'Max. poÄet ÃºÄtov fetchmail';
 $wb['limit_mailquota_txt'] = 'KvÃ³ta schrÃ¡nky';
@@ -65,6 +66,7 @@ $wb['limit_mailalias_error_notint'] = 'Limit Email alias musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailforward_error_notint'] = 'Limit E-mail preposielanie musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailcatchall_error_notint'] = 'Limit E-mail domÃ©novÃ½ kÃ´Å¡ musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailrouting_error_notint'] = 'Limit E-mail smerovania musÃ byÅ¥ ÄÃslo.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'Limit email filter musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailfetchmail_error_notint'] = 'Limit fetchmail musÃ byÅ¥ ÄÃslo.';
 $wb['limit_mailquota_error_notint'] = 'Limit email kvÃ³ta musÃ byÅ¥ ÄÃslo.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'Limits';
-?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index d87fe26da9..a922525b67 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'En Fazla Takma Etki AlanÄ± SayÄ±sÄ±';
 $wb['limit_mailforward_txt'] = 'En Fazla E-posta YÃ¶nlendirme SayÄ±sÄ±';
 $wb['limit_mailcatchall_txt'] = 'En Fazla TÃ¼mÃ¼nÃ¼ Al HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailrouting_txt'] = 'En Fazla E-posta YÃ¶neltici SayÄ±sÄ±';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'En Fazla E-posta SÃ¼zgeci SayÄ±sÄ±';
 $wb['limit_fetchmail_txt'] = 'En Fazla E-posta Alma HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailquota_txt'] = 'E-posta Kutusu KotasÄ±';
@@ -73,6 +74,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'E-posta takma etki alanÄ± sÄ±nÄ±rÄ±
 $wb['limit_mailforward_error_notint'] = 'E-posta yÃ¶nlendirme sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailcatchall_error_notint'] = 'E-posta tÃ¼mÃ¼nÃ¼ al hesabÄ± sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailrouting_error_notint'] = 'E-posta yÃ¶neltici sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-posta sÃ¼zgeci sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailfetchmail_error_notint'] = 'E-posta alma sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailquota_error_notint'] = 'E-posta kota sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
@@ -204,4 +206,3 @@ $wb['email_error_empty'] = 'E-posta boÅŸ olamaz.';
 $wb['limit_directive_snippets_txt'] = 'Web Sunucu YapÄ±landÄ±rma SeÃ§imi GÃ¶rÃ¼ntÃ¼lensin';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'SÄ±nÄ±rlar';
-?>
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 8ae0954db5..64b54bb30e 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -12,6 +12,7 @@ $wb['limit_mailmailinglist_txt'] = 'En Fazla E-posta Listesi SayÄ±sÄ±';
 $wb['limit_mailforward_txt'] = 'En Fazla E-posta YÃ¶nlendirici SayÄ±sÄ±';
 $wb['limit_mailcatchall_txt'] = 'En Fazla TÃ¼mÃ¼nÃ¼ Al HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailrouting_txt'] = 'En Fazla E-posta YÃ¶neltici SayÄ±sÄ±';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'En Fazla E-posta SÃ¼zgeci SayÄ±sÄ±';
 $wb['limit_fetchmail_txt'] = 'En Fazla E-posta Alma HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailquota_txt'] = 'E-posta Kutusu KotasÄ±';
@@ -47,6 +48,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'Takma e-posta etki alanÄ± sÄ±nÄ±rÄ±
 $wb['limit_mailforward_error_notint'] = 'E-posta yÃ¶nlendirme sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailcatchall_error_notint'] = 'E-posta tÃ¼mÃ¼nÃ¼ al sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailrouting_error_notint'] = 'E-posta yÃ¶neltici sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-posta sÃ¼zgeci sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailfetchmail_error_notint'] = 'E-posta alma sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailquota_error_notint'] = 'E-posta kotasÄ± sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
@@ -125,4 +127,3 @@ $wb['xmpp_servers_txt'] = 'XMPP SunucularÄ±';
 $wb['db_servers_txt'] = 'VeritabanÄ± SunucularÄ±';
 $wb['mail_servers_txt'] = 'E-posta SunucularÄ±';
 $wb['Limits'] = 'SÄ±nÄ±rlar';
-?>
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index d7bc06429e..023bc08197 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -7,6 +7,7 @@ $wb['limit_mailaliasdomain_txt'] = 'En Fazla Takma Etki AlanÄ± SayÄ±sÄ±';
 $wb['limit_mailforward_txt'] = 'En Fazla E-posta YÃ¶nlendirici SayÄ±sÄ±';
 $wb['limit_mailcatchall_txt'] = 'En Fazla E-posta TÃ¼mÃ¼nÃ¼ Al HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailrouting_txt'] = 'En Fazla E-posta YÃ¶neltici SayÄ±sÄ±';
+$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
 $wb['limit_mailfilter_txt'] = 'En Fazla E-posta SÃ¼zgeci SayÄ±sÄ±';
 $wb['limit_fetchmail_txt'] = 'En Fazla E-posta Alma HesabÄ± SayÄ±sÄ±';
 $wb['limit_mailquota_txt'] = 'E-posta Kutusu KotasÄ±';
@@ -73,6 +74,7 @@ $wb['limit_mailalias_error_notint'] = 'Takma e-posta sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±
 $wb['limit_mailforward_error_notint'] = 'E-posta yÃ¶nlendirici sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailcatchall_error_notint'] = 'E-posta tÃ¼mÃ¼nÃ¼ al hesabÄ± sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailrouting_error_notint'] = 'E-posta yÃ¶neltici sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
+$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
 $wb['limit_mailfilter_error_notint'] = 'E-posta sÃ¼zgeci sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailfetchmail_error_notint'] = 'E-posta alÄ±cÄ±sÄ± sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
 $wb['limit_mailquota_error_notint'] = 'E-posta kota sÄ±nÄ±rÄ± bir sayÄ± olmalÄ±dÄ±r.';
@@ -210,4 +212,3 @@ $wb['limit_database_quota_error_notint'] = 'VeritabanÄ± kotasÄ± sÄ±nÄ±rÄ± bir sa
 $wb['Reseller'] = 'Reseller';
 $wb['Address'] = 'Address';
 $wb['Limits'] = 'SÄ±nÄ±rlar';
-?>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 1f0a855eef..39512208b4 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -212,6 +212,9 @@
                 <div class="form-group">
                     <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="limit_mail_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_mail_wblist_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="limit_mail_wblist" id="limit_mail_wblist" value="{tmpl_var name='limit_mail_wblist'}" class="form-control" /></div></div>
                 <div class="form-group">
                     <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" /></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 005db0724a..4573e4b0d6 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -169,6 +169,9 @@
                 <div class="form-group">
                     <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="limit_mail_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_mail_wblist_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="limit_mail_wblist" id="limit_mail_wblist" value="{tmpl_var name='limit_mail_wblist'}" class="form-control" /></div></div>
                 <div class="form-group">
                     <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" /></div></div>
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index e1e69d4a14..ff185ce9a4 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -213,6 +213,9 @@
                 <div class="form-group">
                     <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" /></div></div>
+                <div class="form-group">
+                    <label for="limit_mail_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_mail_wblist_txt'}</label>
+                    <div class="col-sm-9"><input type="text" name="limit_mail_wblist" id="limit_mail_wblist" value="{tmpl_var name='limit_mail_wblist'}" class="form-control" /></div></div>
                 <div class="form-group">
                     <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
                     <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" /></div></div>
diff --git a/interface/web/dashboard/dashlets/limits.php b/interface/web/dashboard/dashlets/limits.php
index a299bbcaf3..e5a8cc459f 100644
--- a/interface/web/dashboard/dashlets/limits.php
+++ b/interface/web/dashboard/dashlets/limits.php
@@ -47,6 +47,10 @@ class dashlet_limits
             'db_table' => 'mail_transport',
             'db_where' => "");
 
+        $limits[] = array('field' => 'limit_mail_wblist',
+            'db_table' => 'mail_access',
+            'db_where' => "");
+
         $limits[] = array('field' => 'limit_mailfilter',
             'db_table' => 'mail_user_filter',
             'db_where' => "");
diff --git a/interface/web/mail/lib/lang/ar_mail_blacklist.lng b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
index 5b2815c0d0..6173df6a07 100644
--- a/interface/web/mail/lib/lang/ar_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ar_mail_whitelist.lng b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
index 92c365ba2b..1cdc15564d 100644
--- a/interface/web/mail/lib/lang/ar_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/bg_mail_blacklist.lng b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
index e250039e2e..9b04dc85ba 100644
--- a/interface/web/mail/lib/lang/bg_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'ÐÐºÑ‚Ð¸Ð²ÐµÐ½';
 $wb['source_error_notempty'] = 'ÐŸÐ¾Ð»ÐµÑ‚Ð¾ Ñ Ð°Ð´Ñ€ÐµÑÐ° Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð¾.';
 $wb['type_txt'] = 'Ð¢Ð¸Ð¿';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð¸ÑÑ‚ Ð±Ñ€Ð¾Ð¹ Ð·Ð° ÐµÐ¼Ð°Ð¹Ð» Ñ„Ð¸Ð»Ñ‚Ñ€Ð¸ Ð² Ñ‚Ð²Ð¾ÑÑ‚ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» Ðµ Ð´Ð¾ÑÑ‚Ð¸Ð³Ð½Ð°Ñ‚.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/bg_mail_whitelist.lng b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
index 35c892add4..b17ee61002 100644
--- a/interface/web/mail/lib/lang/bg_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'ÐÐºÑ‚Ð¸Ð²ÐµÐ½';
 $wb['source_error_notempty'] = 'ÐŸÐ¾Ð»ÐµÑ‚Ð¾ Ñ Ð°Ð´Ñ€ÐµÑÐ° Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð¾.';
 $wb['type_txt'] = 'Ð¢Ð¸Ð¿';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð¸ÑÑ‚ Ð±Ñ€Ð¾Ð¹ Ð½Ð° ÐµÐ¼Ð°Ð¸Ð» Ñ„Ð¸Ð»Ñ‚Ñ€Ð¸ Ð·Ð° Ñ‚Ð²Ð¾Ñ Ð°ÐºÐ°ÑƒÐ½Ñ‚ Ðµ Ð´Ð¾ÑÑ‚Ð¸Ð³Ð½Ð°Ñ‚.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist.lng b/interface/web/mail/lib/lang/br_mail_blacklist.lng
index 516946ce19..b72ea94ff3 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist.lng
@@ -6,3 +6,4 @@ $wb['active_txt'] = 'Ativo';
 $wb['source_error_notempty'] = 'DestinatÃ¡rio estÃ¡ vazio.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcanÃ§ado.';
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist.lng b/interface/web/mail/lib/lang/br_mail_whitelist.lng
index e62e5a778e..4af2d198b0 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist.lng
@@ -6,3 +6,4 @@ $wb['active_txt'] = 'Ativo';
 $wb['source_error_notempty'] = 'EndereÃ§o de email estÃ¡ vazio.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O limite de filtros de email para esta conta foi alcanÃ§ado.';
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ca_mail_blacklist.lng b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
index 3f5f9709e8..20d7f65ad2 100644
--- a/interface/web/mail/lib/lang/ca_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actif';
 $wb['source_error_notempty'] = 'L\'adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a Ã©tÃ© atteint.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ca_mail_whitelist.lng b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
index 0d621c95f3..b78c665a10 100644
--- a/interface/web/mail/lib/lang/ca_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actif';
 $wb['source_error_notempty'] = 'L\'adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres Ã  mails pour votre compte a Ã©tÃ© atteint.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 250d3a7ffa..7348b738af 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -6,3 +6,4 @@ $wb['active_txt'] = 'AktivnÃ';
 $wb['source_error_notempty'] = 'Adresa je prÃ¡zdnÃ¡.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Byl dosaÅ¾en maximÃ¡lnÃ poÄet e-mail filtrÅ¯ pro VÃ¡Å¡ ÃºÄet.';
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index c96f21909a..3db1076231 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -6,3 +6,4 @@ $wb['active_txt'] = 'AktivnÃ';
 $wb['source_error_notempty'] = 'Adresa je prÃ¡zdnÃ¡.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Byl dosaÅ¾en maximÃ¡lnÃ poÄet e-mail filtrÅ¯ pro VÃ¡Å¡ ÃºÄet.';
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng
index 4611dadd06..42f1da41d7 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'Adresse ist leer.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filter fÃ¼r Ihr Konto wurde erreicht.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index 1506deba3f..fac0efcb8e 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'E-Mail Adresse ist leer.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Die maximale Anzahl an E-Mail Filtern fÃ¼r Ihr Konto wurde erreicht.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/dk_mail_blacklist.lng b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
index 2830319b06..79ff300aed 100644
--- a/interface/web/mail/lib/lang/dk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'Adresse er tom.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Max. antal af e-mail filtere for din konto er nÃ¥et.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/dk_mail_whitelist.lng b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
index a05c234f94..bb671d84f0 100644
--- a/interface/web/mail/lib/lang/dk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktiv';
 $wb['source_error_notempty'] = 'Adresse er tom.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Max. antal af email filtere for din konto er nÃ¥et.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng
index 479a3deb01..003f7462c7 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Î•Î½ÎµÏÎ³Î®';
 $wb['source_error_notempty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.';
 $wb['type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['limit_mailfilter_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng
index 6c477f60c2..5c3a095a24 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Î•Î½ÎµÏÎ³Î®';
 $wb['source_error_notempty'] = 'Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®';
 $wb['type_txt'] = 'Î¤ÏÏ€Î¿Ï‚';
 $wb['limit_mailfilter_txt'] = 'ÎˆÏ‡ÎµÏ„Îµ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ Ï„Ï‰Î½ Ï†Î¯Î»Ï„ÏÏ‰Î½ email Î³Î¹Î± Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ±Ï‚.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/en_mail_blacklist.lng b/interface/web/mail/lib/lang/en_mail_blacklist.lng
index 8bae57d6b0..6173df6a07 100644
--- a/interface/web/mail/lib/lang/en_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/en_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
\ No newline at end of file
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/en_mail_whitelist.lng b/interface/web/mail/lib/lang/en_mail_whitelist.lng
index f7e4ab881f..d765aad6a1 100644
--- a/interface/web/mail/lib/lang/en_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/en_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Address is empty.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
\ No newline at end of file
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/es_mail_blacklist.lng b/interface/web/mail/lib/lang/es_mail_blacklist.lng
index 81ae71c575..29353365d6 100644
--- a/interface/web/mail/lib/lang/es_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/es_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['server_id_txt'] = 'Servidor';
 $wb['source_error_notempty'] = 'La direcciÃ³n estÃ¡ vacÃa.';
 $wb['source_txt'] = 'DirecciÃ³n en la lista negra';
 $wb['type_txt'] = 'Tipo';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/es_mail_whitelist.lng b/interface/web/mail/lib/lang/es_mail_whitelist.lng
index e92979f13c..8cf5323098 100644
--- a/interface/web/mail/lib/lang/es_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/es_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Habilitado';
 $wb['source_error_notempty'] = 'La direcciÃ³n estÃ¡ vacÃa.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'Ha alcanzado en su cuenta el nÃºmero mÃ¡x. de filtros de correo.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist.lng b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
index 66cb93004e..59aa88bb7e 100644
--- a/interface/web/mail/lib/lang/fi_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'KÃ¤ytÃ¶ssÃ¤';
 $wb['source_error_notempty'] = 'Estetty osoite on tyhjÃ¤';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'KÃ¤yttÃ¤jÃ¤tunnuksella on jo sallittu mÃ¤Ã¤rÃ¤ suodattimia.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist.lng b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
index abd8e85f2b..b0d7cfe270 100644
--- a/interface/web/mail/lib/lang/fi_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'KÃ¤ytÃ¶ssÃ¤';
 $wb['source_error_notempty'] = 'Osoite on tyhjÃ¤';
 $wb['type_txt'] = 'Tyyppi';
 $wb['limit_mailfilter_txt'] = 'KÃ¤yttÃ¤jÃ¤tunnuksella on jo sallittu mÃ¤Ã¤rÃ¤ suodattimia.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist.lng b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
index 161acd632d..035c228bc6 100644
--- a/interface/web/mail/lib/lang/fr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actif';
 $wb['source_error_notempty'] = 'Lâ€™adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres dâ€™e-mail pour votre compte a Ã©tÃ© atteint.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist.lng b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
index f11d0b76a7..ec11e6c674 100644
--- a/interface/web/mail/lib/lang/fr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actif';
 $wb['source_error_notempty'] = 'Lâ€™adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres Ã  mails pour votre compte a Ã©tÃ© atteint.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
index dbce8de10d..6842348ef7 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktivno';
 $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index a43e8eef46..54879fc79c 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktivno';
 $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/hu_mail_blacklist.lng b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
index 1d2f0e014e..e183910f78 100644
--- a/interface/web/mail/lib/lang/hu_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'AktÃv';
 $wb['source_error_notempty'] = 'CÃm Ã¼res.';
 $wb['type_txt'] = 'TÃpus';
 $wb['limit_mailfilter_txt'] = 'Nincs tÃ¶bb szÅ±rÅ‘ lehetÅ‘sÃ©g.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/hu_mail_whitelist.lng b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
index 71c3cf39bb..7cda150e54 100644
--- a/interface/web/mail/lib/lang/hu_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'AktÃv';
 $wb['source_error_notempty'] = 'CÃm mezÅ‘ Ã¼res.';
 $wb['type_txt'] = 'TÃpus';
 $wb['limit_mailfilter_txt'] = 'Nincs tÃ¶bb szÅ±rÅ‘ lehetÅ‘sÃ©g.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/id_mail_blacklist.lng b/interface/web/mail/lib/lang/id_mail_blacklist.lng
index 4454a33c24..2271836a3f 100644
--- a/interface/web/mail/lib/lang/id_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/id_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktif';
 $wb['source_error_notempty'] = 'Alamat kosong.';
 $wb['type_txt'] = 'Tipe';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks penyaringan email untuk akun Anda telah tercapai.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/id_mail_whitelist.lng b/interface/web/mail/lib/lang/id_mail_whitelist.lng
index 52dd134271..d73c11c39c 100644
--- a/interface/web/mail/lib/lang/id_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/id_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktif';
 $wb['source_error_notempty'] = 'Alamat kosong.';
 $wb['type_txt'] = 'Tipe';
 $wb['limit_mailfilter_txt'] = 'Jumlah maks filter email untuk akun Anda telah tercapai.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/it_mail_blacklist.lng b/interface/web/mail/lib/lang/it_mail_blacklist.lng
index 169015d658..bb0c21459b 100644
--- a/interface/web/mail/lib/lang/it_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/it_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Attivo';
 $wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/it_mail_whitelist.lng b/interface/web/mail/lib/lang/it_mail_whitelist.lng
index c63f5759f4..e4b151310b 100644
--- a/interface/web/mail/lib/lang/it_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/it_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Attivo';
 $wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ja_mail_blacklist.lng b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
index 9007f6bb03..a012e29b16 100644
--- a/interface/web/mail/lib/lang/ja_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'æœ‰åŠ¹';
 $wb['source_error_notempty'] = 'ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æŒ‡å®šã—ã¦ãã ã•ã„';
 $wb['type_txt'] = 'ç¨®åˆ¥';
 $wb['limit_mailfilter_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ãŒæœ€å¤§æ•°ã«é”ã—ãŸãŸã‚ã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“ã€‚';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ja_mail_whitelist.lng b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
index 74d51da927..6e903201df 100644
--- a/interface/web/mail/lib/lang/ja_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'æœ‰åŠ¹';
 $wb['source_error_notempty'] = 'ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æŒ‡å®šã—ã¦ãã ã•ã„';
 $wb['type_txt'] = 'ç¨®åˆ¥';
 $wb['limit_mailfilter_txt'] = 'ãƒ¡ãƒ¼ãƒ«ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ãŒæœ€å¤§æ•°ã«é”ã—ãŸãŸã‚ã€ã“ã‚Œä»¥ä¸Šè¿½åŠ ã§ãã¾ã›ã‚“ã€‚';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
index baa7b1ebba..1e4f986b60 100644
--- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actief';
 $wb['source_error_notempty'] = 'Adres is niet ingvuld.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is bereikt.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
index 604110edd5..25b594dba3 100644
--- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Actief';
 $wb['source_error_notempty'] = 'Adres is niet ingvuld.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Het max. aantal e-mail filters voor uw account is bereikt.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 528f2f741a..5558e5f78f 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktywny';
 $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna iloÅ›Ä‡ filtrÃ³w dla Twojego konta zostaÅ‚a przekroczona.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
index 203c5bae73..9e4f6f686c 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Aktywny';
 $wb['source_error_notempty'] = 'Adres jest pusty.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maksymalna iloÅ›Ä‡ filtrÃ³w e-mail dla Twojego konta zosaÅ‚a przekroczona.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/pt_mail_blacklist.lng b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
index b7be9be477..b51b784e0a 100644
--- a/interface/web/mail/lib/lang/pt_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Activo';
 $wb['source_error_notempty'] = 'EndereÃ§o em branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O nÃºmero mÃ¡ximo de filtros de correio para a conta foi atingido..';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/pt_mail_whitelist.lng b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
index 92cc78d80d..f82845095f 100644
--- a/interface/web/mail/lib/lang/pt_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Activo';
 $wb['source_error_notempty'] = 'EndereÃ§o em Branco.';
 $wb['type_txt'] = 'Tipo';
 $wb['limit_mailfilter_txt'] = 'O nÃºmero mÃ¡ximo de filtros para a conta foi atingido.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ro_mail_blacklist.lng b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
index a0feb78262..cd76a87313 100644
--- a/interface/web/mail/lib/lang/ro_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Address este goala';
 $wb['type_txt'] = 'Tip';
 $wb['limit_mailfilter_txt'] = 'Numarul maxim de filtre pentru contul dumneavoastra';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ro_mail_whitelist.lng b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
index 7a3f9f515c..8eab139b00 100644
--- a/interface/web/mail/lib/lang/ro_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Active';
 $wb['source_error_notempty'] = 'Addresa e necompletata';
 $wb['type_txt'] = 'Tip';
 $wb['limit_mailfilter_txt'] = 'numarul maxim de filtre pe contul dumneavoastra a fost atins';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist.lng b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
index 986935386e..8c022b693e 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'ÐÐºÑ‚Ð¸Ð²Ð½Ð¾';
 $wb['source_error_notempty'] = 'ÐÐ´Ñ€ÐµÑ Ð¿ÑƒÑÑ‚Ð¾Ð¹!';
 $wb['type_txt'] = 'Ð¢Ð¸Ð¿';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð² Ð´Ð¾ÑÑ‚Ð¸Ð³Ð½ÑƒÑ‚Ð¾.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist.lng b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
index bd8a1ae06b..5a32140a83 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'ÐÐºÑ‚Ð¸Ð²Ð½Ð¾';
 $wb['source_error_notempty'] = 'ÐÐ´Ñ€ÐµÑ Ð¿ÑƒÑÑ‚Ð¾Ð¹!';
 $wb['type_txt'] = 'Ð¢Ð¸Ð¿';
 $wb['limit_mailfilter_txt'] = 'ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð² Ð´Ð¾ÑÑ‚Ð¸Ð³Ð½ÑƒÑ‚Ð¾.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/se_mail_blacklist.lng b/interface/web/mail/lib/lang/se_mail_blacklist.lng
index 34b1f76db9..08b62e1e7c 100644
--- a/interface/web/mail/lib/lang/se_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/se_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['recipient_txt'] = 'Mottagare';
 $wb['source_error_notempty'] = 'AdressfÃ¤ltet Ã¤r tomt.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter fÃ¶r ditt konto Ã¤r uppnÃ¥tt.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/se_mail_whitelist.lng b/interface/web/mail/lib/lang/se_mail_whitelist.lng
index 7ce682ff6b..3f78c08817 100644
--- a/interface/web/mail/lib/lang/se_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/se_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['recipient_txt'] = 'Mottagare';
 $wb['source_error_notempty'] = 'Adressen Ã¤r tom.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Maximala antalet epostfilter fÃ¶r ditt konto Ã¤r uppnÃ¥tt.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/sk_mail_blacklist.lng b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
index d5775a6642..d3b5c0cfe5 100644
--- a/interface/web/mail/lib/lang/sk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'AktÃvne';
 $wb['source_error_notempty'] = 'Adresa je prÃ¡zdna.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrov pre vÃ¡Å¡ ÃºÄet je dosiahnutÃ½.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/sk_mail_whitelist.lng b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
index 6e2107a0d8..43ce09e77e 100644
--- a/interface/web/mail/lib/lang/sk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'AktÃvne';
 $wb['source_error_notempty'] = 'Adresa je prÃ¡zdna.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Max. poÄet e-mailovÃ½ch filtrov pre vÃ¡Å¡ ÃºÄet je dosiahnutÃ½.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/tr_mail_blacklist.lng b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
index 381a11fa98..b59a9b8b42 100644
--- a/interface/web/mail/lib/lang/tr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Etkin';
 $wb['source_error_notempty'] = 'Adres boÅŸ olamaz.';
 $wb['type_txt'] = 'TÃ¼r';
 $wb['limit_mailfilter_txt'] = 'HesabÄ±nÄ±za ekleyebileceÄŸiniz en fazla e-posta sÃ¼zgeci sayÄ±sÄ±na ulaÅŸtÄ±nÄ±z.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/lib/lang/tr_mail_whitelist.lng b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
index c6272a9ede..1667809c3e 100644
--- a/interface/web/mail/lib/lang/tr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
@@ -6,4 +6,4 @@ $wb['active_txt'] = 'Etkin';
 $wb['source_error_notempty'] = 'Adres boÅŸ olamaz.';
 $wb['type_txt'] = 'TÃ¼r';
 $wb['limit_mailfilter_txt'] = 'HesabÄ±nÄ±za ekleyebileceÄŸiniz en fazla e-posta sÃ¼zgeci sayÄ±sÄ±na ulaÅŸtÄ±nÄ±z.';
-?>
+$wb['limit_mail_wblist_txt'] = 'The max. number of email white / blacklist for your account is reached.';
diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php
index 1ad8d6affd..3c8acb505d 100644
--- a/interface/web/mail/mail_blacklist_edit.php
+++ b/interface/web/mail/mail_blacklist_edit.php
@@ -52,6 +52,21 @@ class page_action extends tform_actions {
 
 	protected $client_allowed_types = array( 'recipient', 'sender' );
 
+	function onShowNew() {
+		global $app;
+
+		if($_SESSION["s"]["user"]["typ"] != 'admin') {
+			if(!$app->tform->checkClientLimit('limit_mail_wblist')) {
+				$app->error($app->tform->wordbook["limit_mail_wblist_txt"]);
+			}
+			if(!$app->tform->checkResellerLimit('limit_mail_wblist')) {
+				$app->error('Reseller: '.$app->tform->wordbook["limit_mail_wblist_txt"]);
+			}
+		}
+
+		parent::onShowNew();
+	}
+
 	function onBeforeUpdate() {
 		global $app, $conf;
 
@@ -70,23 +85,37 @@ class page_action extends tform_actions {
 
 		// Non-admin checks
 		if($_SESSION["s"]["user"]["typ"] != 'admin') {
-			// Non-admin can only use type 'sender' or 'recipient' and address must belong to the client's domains
+			// Non-admin can only use type 'sender' or 'recipient'
 			if(! in_array($this->dataRecord["type"], $this->client_allowed_types)) {
 				$app->tform->errorMessage .= $app->lng('Blacklist type requires admin permissions');
 			}
-			// address must be valid email
+
+			// Address must be valid email
 			if(! filter_var( $this->dataRecord["source"], FILTER_VALIDATE_EMAIL )) {
 				$app->tform->errorMessage .= $app->lng('Invalid address: must be a valid email address');
 			}
+
+			// Address must belong to the client's domains
 			$tmp = explode('@', $this->dataRecord["source"]);
 			$domain = trim( array_pop($tmp) );
 			$AUTHSQL = $app->tform->getAuthSQL('r');
 			$rec = $app->db->queryOneRecord("SELECT domain_id from mail_domain WHERE ${AUTHSQL} AND domain = ?", $domain);
-			// address must belong to the client's domains
 			if(! (is_array($rec) && isset($rec['domain_id']) && is_numeric($rec['domain_id']))) {
 				$app->tform->errorMessage .= $app->lng('Invalid address: you have no permission for this domain.');
 			}
 			unset($rec);
+
+			// Check the client limits
+			$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+			$client = $app->db->queryOneRecord("SELECT limit_mail_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+			if($this->id == 0 && $client["limit_mail_wblist"] >= 0) {
+				$TYPES_LIST = "('" . join("', '", $this->client_allowed_types) . "')";
+				$tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE ${AUTHSQL} AND type in ${TYPES_LIST}");
+				if($tmp["number"] >= $client["limit_mail_wblist"]) {
+					$app->tform->errorMessage .= $app->tform->wordbook["limit_mail_wblist_txt"]."<br>";
+				}
+				unset($tmp);
+			}
 		}
 		
 		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
@@ -99,5 +128,4 @@ class page_action extends tform_actions {
 $app->tform_actions = new page_action;
 $app->tform_actions->onLoad();
 
-
 ?>
diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php
index 52106c1882..bfabbe64d2 100644
--- a/interface/web/mail/mail_whitelist_edit.php
+++ b/interface/web/mail/mail_whitelist_edit.php
@@ -52,6 +52,21 @@ class page_action extends tform_actions {
 
 	protected $client_allowed_types = array( 'recipient', 'sender' );
 
+	function onShowNew() {
+		global $app;
+
+		if($_SESSION["s"]["user"]["typ"] != 'admin') {
+			if(!$app->tform->checkClientLimit('limit_mail_wblist')) {
+				$app->error($app->tform->wordbook["limit_mail_wblist_txt"]);
+			}
+			if(!$app->tform->checkResellerLimit('limit_mail_wblist')) {
+				$app->error('Reseller: '.$app->tform->wordbook["limit_mail_wblist_txt"]);
+			}
+		}
+
+		parent::onShowNew();
+	}
+
 	function onBeforeUpdate() {
 		global $app, $conf;
 
@@ -70,25 +85,40 @@ class page_action extends tform_actions {
 
 		// Non-admin checks
 		if($_SESSION["s"]["user"]["typ"] != 'admin') {
-			// Non-admin can only use type 'sender' or 'recipient' and address must belong to the client's domains
+			// Non-admin can only use type 'sender' or 'recipient'
 			if(! in_array($this->dataRecord["type"], $this->client_allowed_types)) {
 				$app->tform->errorMessage .= $app->lng('Whitelist type requires admin permissions');
 			}
-			// address must be valid email
+
+			// Address must be valid email
 			if(! filter_var( $this->dataRecord["source"], FILTER_VALIDATE_EMAIL )) {
 				$app->tform->errorMessage .= $app->lng('Invalid address: must be a valid email address');
 			}
+
+			// Address must belong to the client's domains
 			$tmp = explode('@', $this->dataRecord["source"]);
 			$domain = trim( array_pop($tmp) );
 			$AUTHSQL = $app->tform->getAuthSQL('r');
 			$rec = $app->db->queryOneRecord("SELECT domain_id from mail_domain WHERE ${AUTHSQL} AND domain = ?", $domain);
-			// address must belong to the client's domains
 			if(! (is_array($rec) && isset($rec['domain_id']) && is_numeric($rec['domain_id']))) {
 				$app->tform->errorMessage .= $app->lng('Invalid address: you have no permission for this domain.');
 			}
 			unset($rec);
+
+			// Check the client limits
+			$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+			$client = $app->db->queryOneRecord("SELECT limit_mail_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+			if($this->id == 0 && $client["limit_mail_wblist"] >= 0) {
+				$TYPES_LIST = "('" . join("', '", $this->client_allowed_types) . "')";
+				$tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE ${AUTHSQL} AND type in ${TYPES_LIST}");
+				if($tmp["number"] >= $client["limit_mail_wblist"]) {
+					$app->tform->errorMessage .= $app->tform->wordbook["limit_mail_wblist_txt"]."<br>";
+				}
+				unset($tmp);
+			}
 		}
 
+
 		if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
 
 		parent::onSubmit();
@@ -99,5 +129,4 @@ class page_action extends tform_actions {
 $app->tform_actions = new page_action;
 $app->tform_actions->onLoad();
 
-
 ?>
diff --git a/remoting_client/API-docs/client_add.html b/remoting_client/API-docs/client_add.html
index 0e9e9cd9c6..a9390900e6 100644
--- a/remoting_client/API-docs/client_add.html
+++ b/remoting_client/API-docs/client_add.html
@@ -43,6 +43,7 @@
 <p class="margin"> limit_mailforward&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailcatchall&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailrouting&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
+<p class="margin"> limit_mail_wblist&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailfilter&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_fetchmail&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailquota&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
diff --git a/remoting_client/API-docs/client_update.html b/remoting_client/API-docs/client_update.html
index 9cbdcd2f33..b38ecb8a67 100644
--- a/remoting_client/API-docs/client_update.html
+++ b/remoting_client/API-docs/client_update.html
@@ -43,6 +43,7 @@
 <p class="margin"> limit_mailforward&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailcatchall&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailrouting&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
+<p class="margin"> limit_mail_wblist&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailfilter&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_fetchmail&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> limit_mailquota&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
diff --git a/remoting_client/examples/client_add.php b/remoting_client/examples/client_add.php
index 6d5b5934d7..7be7493e94 100644
--- a/remoting_client/examples/client_add.php
+++ b/remoting_client/examples/client_add.php
@@ -41,6 +41,7 @@ try {
 		'limit_mailforward' => -1,
 		'limit_mailcatchall' => -1,
 		'limit_mailrouting' => 0,
+		'limit_mail_wblist' => 0,
 		'limit_mailfilter' => -1,
 		'limit_fetchmail' => -1,
 		'limit_mailquota' => -1,
-- 
GitLab