diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 02a94fdc1a116166b9f30247e27b5c2304e2ba46..13b1e1097eda5bf43f308dcdcce84a39634d025d 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 d4640ea47adee393ea36aa6abfbe12a1878a8480..333a908a5a797686f29f4f22c8ab5d9febad7b77 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 0801ae3515a3c6631790726e5b211949c6aa4bcd..7ad9aecac6f262f8a558b24773860df74d71d38d 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 4a3405bbe5f622a8fce3328a3d16156626269021..5883cce56c2dd5bc1cef98895d4421b2bd5aaa70 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 3c559c78d67bdfd2453c4c878ed9ce1ac19677c2..8c94132b3b04e439cab38ce047623ceb9b1284ae 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 04a7c6d17f09e37bbfbb38050f2ec049377b3b30..fde7171aa2fbe7fe8edfac451d5bab496b9fe1fa 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 0a88594a596ba0abf017cf2327cf11bfb97ee02d..fe67603b19342ceaa2508ecfab970b0f12adaf01 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 512bc5cb23709ef0cdef6bc5c604607ecb6b0741..afd557ab1897aa649244717150888d75beec1715 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 d6effa66e064d4296e1b80ef0066dd3136ce0fe6..d9e5c1de617410cf64497022a0e2352b391df928 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 75f89a0feaf103179cb050f2c887dad23836d45a..0ca56504f141eba0553c266f4fb3371f3a70bd2c 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 f749fa5519b493a4c5a3e79eddd82a17c2e755a9..d34dff83d68405f57b95fd1dbe146b0b63b055f2 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 2f9d3c205693e7bc0f037b8beeb6d3a2c21a4244..4d2928459d0b96b4dc7f60b77021e97d1fa2e5b5 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 bfafbeb823a572ac84782bb06c93af1c7efba1d7..3c866f48e7ce4225c6fae0df65b75ff9480fc57a 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 08941ffd885ad552a014d4c3c886f5cfc58b7be2..9dacacda440b8d015d5abe8bd9cd98270a89a8e0 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 e4cc2f2dbe8abe53e47b862059d98c0a6ed859ec..56b6718749c208beb26a9d18391b6c35dc39ce5f 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 aa51796744065e73767b39037d08c8f93970fe81..c72d067822ec448467ecd7ac35bd48d373c51e80 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 411096ef5402dab83ac64fbe3f5c7e2f37007a40..de734d385b13651568c90b4457ea7ef460d32179 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 372080507e70e08ec1e87ff5bffd3ddcc3702562..c6bc86a59d756104d8440c942041d4caf640f41b 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 8cb8b34a4ea09113f0f4643b826d04b9b7cb1d53..812a8e2766b9285107e6e247cbab6d9145d8f45d 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 751afa6990f0d674ad528ae40e985917f42d1f1c..79888530b097e1fc669f0e3cd20dc5757cc3e669 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 ca22ce638cf7c28d3dd33e717df4e8c25bbfd3a0..cce0b03b683d1f3a3b66ec45c7a2f722fe9d96bf 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 a8431a81878988f8fde1ad02758676606fc06fbf..aaf26f99966056292e1dc8c7098f1f562c4d0c94 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 9f68b18cf50c4f33ac987026b17781ec192da0dd..5d6a8f134f6f4c499b157bb72042be7b1c0c11ef 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 b1e549dd9129065e21ab1e82fc125ce56e40785c..fc83620acb41433374349df6298fef81bf8ec39b 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 04acf57d64ac8e999f7178e948dcc3d1557c8ba1..fa9399197fa0d7a411b0293afe7e35d900044ad2 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 12004df7619c4a0adfc66ecb2091e7da94fa06e8..19babe52d47f8c51e8f5b25f1048c03db5f84815 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 144e632ef6831253f7842319e0695bc36feed1bf..3d61198d3debe66f04424ba4dd9c0eb9b341fc61 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 91be0bcffd0ea72433646a1586091663f6119e16..7d05bd4cc8b60f56f5731e5515832b7742b6665a 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 3a5e5159aa80a0dcf86a99c7d63a3b3278a2be71..9aa37a633325e3aa06846ca5a23cdf344f36cbf0 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 a5991260c5eb63f3d27684aa258534992bebabec..ee5f3675bdf42e4aadfe1cc3de5b9772aa1fb73b 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 aa3dfdcb6e592b4b5013b1d26a05b6ce9e7ea60c..bfccedcf1e6c47184051e5337fc3e4c4cae1b841 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 ec94cb017801a933a72b9fd8becf0c0cd2f1239f..c2315c67b4a35ced167b8342cf7c910fe226d922 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 eae85315b68df4ae44d6ba5bb314aaa901c0ec90..645a533a51c0b1d2f54b50da62c8a9c99b226781 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 5c55b23f89e31b3e1c22d4f6b8b4e51624cb35a9..17c73de969f1394950cd0ab851f6c074a372855c 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 6830c56cb83d4208755cb22c37e57ab1db7d267a..d2553ce83c88cf13ab60a3141f3117c1f0bffba1 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 7769af8b999f0984975ac089b3b6e2dd87b267fc..c0c0a5ba3afb8a361fc679b7ea1b579b8a9ee57c 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 70d9069664adfa3c5b20b0a37234c82e4ff418c3..d24182806bf4e6b497c8f3a4d505b562ba6a8896 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 fbd09f4b3e843c2a130ab8c9ac059b379bf681c7..06e2ef5fcaa2d75caa71edca40ae473e19e45d21 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 c3de724d93f39b704d75c9b21a5e3c08a743b35d..4ef9a64eeb733833028a046de3d7953e13a1d187 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 b81788c0d441ba274b6823c581a80c553d39ad11..e443eb7801430b3a221c6a6c67d021792410f0d3 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 76d44cb324ea63af17073ef438498e6c696d6ee8..448a91ea3923df7d588771d569e21a4c58674373 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 4d16bac0cb308c935300d320577893d89bf34c5f..aac50a2f2a2561378d7249faf648533e0f8ee5b4 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 12fabbe72308f34821d23d9ff1412d81ed93f6ee..4a2cd0500cfbc87a29a52c28b8caca28b657571c 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 d4b9f58eebb33c1cf54ced71aa2fd3ef168fbcd5..9b01f30b2df19de187796527f615bf4918e86858 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 b11e03273ec3673f8e225372f1899806b8da98b5..402e5adf04c53a0a0539771feac27259ada8a920 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 3df432a6612cdc53ea3cd5dfce17e2574bc6fd68..9300d945b615fe2eece54b702d0c16717f87e337 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 76755a112b1a13b5bf5445a69a639888ce0b70c5..5970b80d46fd715dc547a8c472aea0ea2a573630 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 df858ebdfaace28cfd2dbbef8c5992070a5c65cf..c7b5cafa43e61bcb2835edce95127c9dadfebf8b 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 57c55be57648a7db16ef9827d22a386b1de2a7d0..007b4af0da98ba6a80abb6b4645ce0553030f394 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 e639f4929e6bb41a7dc98d9740eb2bf31237cdf7..11b0d95d74e71583cb419f9415b43347fe16bb81 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 8442ace734cb26810b89cda156fd43d86bcabd44..6ad3f11a202c9dfed9ba71a6824d05f1994c76ef 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 40ef74de160797b3534a5da9a2c5004fb32dfe57..bc1f90052aaafc4f098340adacf144e154fc4491 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 8b5d7194273565494c01f22656827eef21ee9a1c..a90a2d807873e7ac2e552bc6164e7281034fc4b0 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 de4642d72d88f3f4c29d9544cfb0526793ab8471..be88a575cdb66e599f18b3aa9d424bf8f103800a 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 7381465d66bd68c4a957412ea0531e964974828e..ca83bda97a8aa9f8f61c9a32c4afa192a0f146df 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 a4df95b8b9aebe8593d2b08be2cfa3c7d9cbb8d0..1b89262493794ca8d14e1e95203cf282ec7e2b70 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 cd9f6e1742feeb339492320d0ce4da31edb9beb7..1f4e5d70a1471c06b694fb86fa2cbe1843f9c91b 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 da4721757d4ef63f605c40248f59b101a95c8913..423b4d7b946da68910346f3a94c925a9532a0678 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 e8df5f7ad8b1c50b6f037af1127847d9dcbe6526..637dddc65d2ca6b90dc6e43a376a6f3fe74b06de 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 89fafa6776c3239f4c2a4f976b488021a4ae9dd1..c040e787ae5c190590a9797fdbdd24dba8fba7a9 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 3a878ec9746b4bb9908777c2e80cfe4addbef39c..5945310d0c9ec00b5d46baf515beafabc4aa3835 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 71f5bcfa4b157a8d390b6fbe045d73047dd84676..2762ebc15b1d110fb33e0dbc1646be88582bc82b 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 9ce35235cddb8794e402fdaa19d8efafbb7e635d..8ce72350798ba5432ac6b32e158d6fa1fd0dd368 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 0c4a949d49d89b75173c953794734b04f83b4856..b774a8c4108f507aaf481468b6be0e47b9b63a4f 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 6bd89a971aac692890aef636617d142725d485bb..965a446ffbab60c3ce935efae3b94d7be12f2aa1 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 3bc5e59d2aedd08c4cde3b39efd058c9598deb6b..5ee1d8aaf6caf2c8e70adfd8a8e2c8db80ffb119 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 57cbe690ddc4eef4ed84c27931ab846becdda8ef..65e110c2abcf40f51d9c961a70cbdc6275484c83 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 512bc5cb23709ef0cdef6bc5c604607ecb6b0741..afd557ab1897aa649244717150888d75beec1715 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 080512f5b0ad166ed99cdc9810aacafb50e2f759..70456bd2553d74625ac999d4e7326aabadbe4465 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 46168e1ad55e2e21265e87c6ab4a822cd92b350a..e540984824afad914244248dfead787b36bfc7fe 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 f5806377c3f010f24257632ace654aef5f39839e..4b90d0347ac2941b940575347729119d865fe11d 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 feaee0e9c1760498efbdb21d239e103cffeeb647..bf585054cd11f2a8416550e2754fbacfb7bb3b97 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 46932c9e50960fd7273b4a06e12934c0864969fa..c9001e42e29ab6a7fb67b3bc89eaecfef07fc6ac 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 512bc5cb23709ef0cdef6bc5c604607ecb6b0741..afd557ab1897aa649244717150888d75beec1715 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 542b4121d939aa504d397b9af487c0d8c6b22293..cfaced056192b3a747185c29f98d6d3ae70de939 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 e3cb788bdd6ce5c412ca6349576ccd5f229ebe9c..9a602da09369509d57d2a6dc5c50cb2634f2ff6a 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 82b289df2b3f53d9da459fc6256a211b4bcfc005..47dbd4f64c7d963144825bc4346c37d47f22b91a 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 d87fe26da90ab23836ef720031cf9f2498f04f90..a922525b67dc39f6f91151ee7db0d2796ba8c3eb 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 8ae0954db550fb2ecce8cc12386808f92fc0e504..64b54bb30e6c7ddd4923b7f30edb1efcd0089efb 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 d7bc06429e137f5cd6abf3a3205870f7bee8866d..023bc081978d36ce5bb49765234f7eae9395972e 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 1f0a855eef75f9601eed6d3655fd46d4b11de8fb..39512208b45dbf2f93e1cb5215f8243cadcc5ef0 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 005db0724a9d7c70a4986d5f00d7ea2e11073b08..4573e4b0d6b31977ad6deb1d97a0d1f69caeafa9 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 e1e69d4a14a51d0bb90db0e49fcc2630e259acf4..ff185ce9a40925038ecd7553a1ec8353a16b51f8 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 a299bbcaf35f891766ca930ed38e96451aaed649..e5a8cc459fa2f141eceb471ea829b5b1e048e7b0 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 5b2815c0d00a2e2c3f96064cfd11561472e8ed78..6173df6a0745b2dae013829ccdb2ad0026be3613 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 92c365ba2b55b1f47c63880b3722132cf6842950..1cdc15564d0573af0bcd8f7b09d610f627a8e127 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 e250039e2edc54a09944c432c1c71252f3e6c840..9b04dc85babcb1a94ae0c60ccbef568a2c821a15 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 35c892add4adb43a689d904b64becec6af78766a..b17ee61002af86fb407ceffaaf9e61dbe0547223 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 516946ce198e1b25329a3e67cc311703040c5571..b72ea94ff3f8210267cbc34e7b4ed50b54ac0fc5 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 e62e5a778e6817797bfbf956417ca5fdf6ce7230..4af2d198b06249d1584d3256dbf1fcec2ad8e6f1 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 3f5f9709e84b156c84043a4cf5c4cce65d7fff91..20d7f65ad2b174bae31cbf66eb0ff9b59d10b18b 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 0d621c95f3bc53a44b0ce1061f048c97573f370b..b78c665a103c6087d6a0bfc62866eaaa34ecbd75 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 250d3a7ffa053acfe8f5be58c4c355f6a137b036..7348b738af49cc765c187b928ba7b6cc1270453b 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 c96f21909a39c8d4736c14d18b813a8aa404d47c..3db10762319ff189406c7c8ba4b2e58dfe395550 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 4611dadd063c6eefcf51a2cada37f663975b2c05..42f1da41d7ca0a654535bf1325e347a6f5f1173a 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 1506deba3f92bcd98b26d8a699e6171e6e039fa5..fac0efcb8e3832300b8bed40437f7ffebaeebfe3 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 2830319b06fccc99f723e2059eb759a11ba71ab1..79ff300aede0fdb599759ed502510e2b2649a69c 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 a05c234f943b27fd395e01cd8a8feae829bd196d..bb671d84f0f30b4708ac48b1de233e1e7b7f44d5 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 479a3deb0168c44221f7a64a8872e44a780a9659..003f7462c7656833cd9a9cbf1d3e3186247d0e4d 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 6c477f60c2b4f0bd2b0bed463245abb0b4c6336b..5c3a095a24c9e2b0ffbcf0a1f046d0d20db025a9 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 8bae57d6b0d50a40e668d353a9a09afc7117d0f2..6173df6a0745b2dae013829ccdb2ad0026be3613 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 f7e4ab881f8343a93a6bfcd9946256ee8a756a26..d765aad6a1e3d0a894c6a103dd2a0f5607159466 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 81ae71c57579910dce7e27c264fa2745a2b1ef07..29353365d65e96dd1844ea01912fb517d703e4a6 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 e92979f13ce39c9180aa4bd0a9bbf4ff058cc3df..8cf5323098e0ab4245fde92cc1c562940130fd2a 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 66cb93004e643e787eb070d5a9fc237ace48f8a1..59aa88bb7efa3eafd870ef9357d2e6a0185b32d3 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 abd8e85f2b9cb8ca60adac31dc76acce40396ed2..b0d7cfe270d46498c57e65ac0c39e9a1feb6f112 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 161acd632ddea126dc1e2f472961fb733b2358fd..035c228bc66c264003cec0adc57bebbf47894b7e 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 f11d0b76a747cc01150ab503003bc77e28911170..ec11e6c6747ae9fe1d0b991b8c1cadd14f986436 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 dbce8de10d73e7297f3c81c697f1eb5f23f2c3af..6842348ef7336880309cb03416e776ba5462c44f 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 a43e8eef466b41cd55c1868048820f12215d9431..54879fc79cacb76ef34e1a1e7f3446dc809b2d86 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 1d2f0e014ecac7e1d1c3f940ab6b84c0e4b45721..e183910f78b1032f1c0e2b564e51392d320f356d 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 71c3cf39bbc118667588f71ab6a18b66794e96df..7cda150e5482485d84d97ef1e42b03f6d9ad4487 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 4454a33c2409a614199b711e97bc72a7996a1a45..2271836a3fde960d42a896242949095d93cb8cc6 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 52dd134271f37eda1f4322b39936e587266994a5..d73c11c39cce6847c5c402590be25e412a2c1c74 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 169015d65844c7c1948cc694fff7081c9c5d5a1f..bb0c21459bac5fa30ad53173ac206e26f475ac30 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 c63f5759f4296fa82b038d7435f4e5a1bf47fb05..e4b151310b64f323560fbcbf36586b4081d8f903 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 9007f6bb03de75efbc9877f14001161a3455e838..a012e29b16a3d890ab9d3275eb1c3a41b5341b68 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 74d51da927e3d437cdcf64b026dd43674bc3c932..6e903201df7c27ac56c3a8cf7c253f4b6257eee2 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 baa7b1ebba78ab8731efa719d7072d90faf4606b..1e4f986b60bde5afff574f8e5b8e67a79711a2f7 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 604110edd55f3e73be41f805c46cea4ef420f22a..25b594dba3e1423faa1bd22a2bfc8d4b7790cf64 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 528f2f741aee3944e1f99f015010dee5fc0a140a..5558e5f78fe035820fd6237b506c7c888fee8fbf 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 203c5bae73b49489f47af28011cae1646f4880fd..9e4f6f686c7509232581aff7c090317c62f3af94 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 b7be9be47761be813f051d4b712b081d83ef62ee..b51b784e0ab37c90f92d155cd556dfef6469e7d7 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 92cc78d80dda3724e35c90f8e1f690dbf6e5f9dd..f82845095f234500e491a29e00e807b8cebd8fca 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 a0feb782628495633fa6eda926e034ff859b1b43..cd76a8731317b17f11782e48bac10b8c38f61c83 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 7a3f9f515cff3ecdfb765e7b21ad3f5e6dfc5ae4..8eab139b004d0ffc060c9b03fe9355b087535cb7 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 986935386e8d9c0dc85ac0f48ed3cc29d0a02b44..8c022b693e07c1a1cb7d7187c5f9f5c3d0b494ca 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 bd8a1ae06b5d79174682ceef92a9c2d3278e2ab0..5a32140a8379ee3eec84c9a46dfffcfcc0811c3c 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 34b1f76db96f694b1701f0aa4f2d6290ec03f1f4..08b62e1e7cfd3e266b7a71f251e3c8bdd7f49882 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 7ce682ff6b83d2645fc92b43d77e1bc01060845e..3f78c08817f49c91d50bfe5fa52cfc1fbad82681 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 d5775a66420d623f659aea37ded6d0e768209623..d3b5c0cfe5835a44348158eb17c00d4d7718bf23 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 6e2107a0d8d304520c5f91083ef9858cf8d0da10..43ce09e77e90501b6ae27eebcaec0a7de1e99ced 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 381a11fa98c2f651fd77a823bff5c88e4cb0ebda..b59a9b8b4258e49145dbf394d70174d1e913bfd5 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 c6272a9ede18c272efb8036cc8b7022ffebec0f4..1667809c3e8bb40a6d8a1d9089cea32b192dd7ac 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 1ad8d6affd92eb8e8563fabf91c8feeccab10250..3c8acb505d813662eb670deaf67b8c8a65fd5a50 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 52106c18822b05ada7cbf2549caf8da49380f503..bfabbe64d2c74364d5a5a7c50f088ad8565030e8 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 0e9e9cd9c61eb45e21208d43d76d82a57186ae2a..a9390900e61f6d01221ba460a3847dfc45be888a 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 9cbdcd2f332e1b606e3eb8ab5b861a9a0b25b0a3..b38ecb8a671344869b562906fc0c168c1a605e57 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 6d5b5934d76cfc827e6c209b708ffe09106061ca..7be7493e9408e631af9595cdd33cbce977622bfd 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,