diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 9620bf3561ff4e403220bc94bbc3dad61e7ebe76..25dc46143351b328d1d7d8905d6eb38dcb1639fe 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -57,58 +57,12 @@ class installer_dist extends installer_base {
 			$this->error("The postfix configuration directory '$config_dir' does not exist.");
 		}
 
-		//* mysql-virtual_domains.cf
-		$this->process_postfix_config('mysql-virtual_domains.cf');
-
-		//* mysql-virtual_forwardings.cf
-		$this->process_postfix_config('mysql-virtual_forwardings.cf');
-
-		//* mysql-virtual_alias_domains.cf
-		$this->process_postfix_config('mysql-virtual_alias_domains.cf');
-
-		//* mysql-virtual_alias_maps.cf
-		$this->process_postfix_config('mysql-virtual_alias_maps.cf');
-
-		//* mysql-virtual_mailboxes.cf
-		$this->process_postfix_config('mysql-virtual_mailboxes.cf');
-
-		//* mysql-virtual_email2email.cf
-		$this->process_postfix_config('mysql-virtual_email2email.cf');
-
-		//* mysql-virtual_transports.cf
-		$this->process_postfix_config('mysql-virtual_transports.cf');
-
-		//* mysql-virtual_recipient.cf
-		$this->process_postfix_config('mysql-virtual_recipient.cf');
-
-		//* mysql-virtual_sender.cf
-		$this->process_postfix_config('mysql-virtual_sender.cf');
-
-		//* mysql-virtual_sender_login_maps.cf
-		$this->process_postfix_config('mysql-virtual_sender_login_maps.cf');
-
-		//* mysql-virtual_client.cf
-		$this->process_postfix_config('mysql-virtual_client.cf');
-
-		//* mysql-virtual_relaydomains.cf
-		$this->process_postfix_config('mysql-virtual_relaydomains.cf');
-
-		//* mysql-virtual_relayrecipientmaps.cf
-		$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
-
-		//* mysql-virtual_outgoing_bcc.cf
-		$this->process_postfix_config('mysql-virtual_outgoing_bcc.cf');
-
-		//* mysql-virtual_policy_greylist.cf
-		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
-
-		//* mysql-virtual_gids.cf.master
-		$this->process_postfix_config('mysql-virtual_gids.cf');
-
-		//* mysql-virtual_uids.cf
-		$this->process_postfix_config('mysql-virtual_uids.cf');
+		//* Install virtual mappings
+		foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
+			$this->process_postfix_config( basename($filename, '.master') );
+		}
 
-		//* mysql-virtual_alias_domains.cf
+		//* mysql-verify_recipients.cf
 		$this->process_postfix_config('mysql-verify_recipients.cf');
 
 		//* postfix-dkim
@@ -208,6 +162,7 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/mime_header_checks');
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
+		touch($config_dir.'/sasl_passwd');
 
 		//* Create the mailman files
 		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index f719fbee3819c2477d6a036749d09ba027b5f50a..78dffabf85a4d94e2ca52b147f5588dd508e390c 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -63,6 +63,9 @@ class installer extends installer_base
 			$this->process_postfix_config( basename($filename, '.master') );
 		}
 
+		//* mysql-verify_recipients.cf
+		$this->process_postfix_config('mysql-verify_recipients.cf');
+
 		//* Changing mode and group of the new created config files.
 		caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
 			__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
@@ -157,6 +160,7 @@ class installer extends installer_base
 		touch($config_dir.'/mime_header_checks');
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
+		touch($config_dir.'/sasl_passwd');
 
 		//* Create auxillary postfix conf files
 		$configfile = 'helo_access';
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index b9e3a1c575f8a9edd83c572840bcf796571c54cc..3effb1d10c8cc61af717601cdaece67e784e9444 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -57,55 +57,12 @@ class installer_dist extends installer_base {
 			$this->error("The postfix configuration directory '$config_dir' does not exist.");
 		}
 
-		//* mysql-virtual_domains.cf
-		$this->process_postfix_config('mysql-virtual_domains.cf');
-
-		//* mysql-virtual_forwardings.cf
-		$this->process_postfix_config('mysql-virtual_forwardings.cf');
-
-		//* mysql-virtual_alias_domains.cf
-		$this->process_postfix_config('mysql-virtual_alias_domains.cf');
-
-		//* mysql-virtual_alias_maps.cf
-		$this->process_postfix_config('mysql-virtual_alias_maps.cf');
-
-		//* mysql-virtual_mailboxes.cf
-		$this->process_postfix_config('mysql-virtual_mailboxes.cf');
-
-		//* mysql-virtual_email2email.cf
-		$this->process_postfix_config('mysql-virtual_email2email.cf');
-
-		//* mysql-virtual_transports.cf
-		$this->process_postfix_config('mysql-virtual_transports.cf');
-
-		//* mysql-virtual_recipient.cf
-		$this->process_postfix_config('mysql-virtual_recipient.cf');
-
-		//* mysql-virtual_sender.cf
-		$this->process_postfix_config('mysql-virtual_sender.cf');
-
-		//* mysql-virtual_sender_login_maps.cf
-		$this->process_postfix_config('mysql-virtual_sender_login_maps.cf');
-
-		//* mysql-virtual_client.cf
-		$this->process_postfix_config('mysql-virtual_client.cf');
-
-		//* mysql-virtual_relaydomains.cf
-		$this->process_postfix_config('mysql-virtual_relaydomains.cf');
-
-		//* mysql-virtual_relayrecipientmaps.cf
-		$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
-
-		//* mysql-virtual_policy_greylist.cf
-		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
-
-		//* mysql-virtual_gids.cf.master
-		$this->process_postfix_config('mysql-virtual_gids.cf');
-
-		//* mysql-virtual_uids.cf
-		$this->process_postfix_config('mysql-virtual_uids.cf');
+		//* Install virtual mappings
+		foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
+			$this->process_postfix_config( basename($filename, '.master') );
+		}
 
-		//* mysql-virtual_alias_domains.cf
+		//* mysql-verify_recipients.cf
 		$this->process_postfix_config('mysql-verify_recipients.cf');
 
 		//* postfix-dkim
@@ -219,6 +176,7 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/mime_header_checks');
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
+		touch($config_dir.'/sasl_passwd');
 
 		//* Create the mailman files
 		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 50376e455e64f15149bb974d96e3c47f422204eb..1666b4c40d277f975ef28b7248683e229cf44290 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -43,6 +43,15 @@ class installer_base {
 		global $conf; //TODO: maybe $conf  should be passed to constructor
 	}
 
+	private function install_acme() {
+		$install_cmd = 'wget -O -  https://get.acme.sh | sh';
+		$ret = null;
+		$val = 0;
+		exec($install_cmd . ' 2>&1', $ret, $val);
+
+		return ($val == 0 ? true : false);
+	}
+
 	//: TODO  Implement the translation function and language files for the installer.
 	public function lng($text) {
 		return $text;
@@ -674,9 +683,6 @@ class installer_base {
 				if ($verbose){
 					echo $query ."\n";
 				}
-				if(!$this->dbmaster->query($query, $value['db'] . '.software_update_inst', $value['user'], $host)) {
-					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
-				}
 
 				$query = "GRANT SELECT, UPDATE(`updated`) ON ?? TO ?@?";
 				if ($verbose){
@@ -1051,58 +1057,12 @@ class installer_base {
 		$postfix_version = preg_replace('/.*=\s*/', '', $out[0]);
 		unset($out);
 
-		//* mysql-virtual_domains.cf
-		$this->process_postfix_config('mysql-virtual_domains.cf');
-
-		//* mysql-virtual_forwardings.cf
-		$this->process_postfix_config('mysql-virtual_forwardings.cf');
-
-		//* mysql-virtual_alias_domains.cf
-		$this->process_postfix_config('mysql-virtual_alias_domains.cf');
-
-		//* mysql-virtual_alias_maps.cf
-		$this->process_postfix_config('mysql-virtual_alias_maps.cf');
-
-		//* mysql-virtual_mailboxes.cf
-		$this->process_postfix_config('mysql-virtual_mailboxes.cf');
-
-		//* mysql-virtual_email2email.cf
-		$this->process_postfix_config('mysql-virtual_email2email.cf');
-
-		//* mysql-virtual_transports.cf
-		$this->process_postfix_config('mysql-virtual_transports.cf');
-
-		//* mysql-virtual_recipient.cf
-		$this->process_postfix_config('mysql-virtual_recipient.cf');
-
-		//* mysql-virtual_sender.cf
-		$this->process_postfix_config('mysql-virtual_sender.cf');
-
-		//* mysql-virtual_sender_login_maps.cf
-		$this->process_postfix_config('mysql-virtual_sender_login_maps.cf');
-
-		//* mysql-virtual_client.cf
-		$this->process_postfix_config('mysql-virtual_client.cf');
-
-		//* mysql-virtual_relaydomains.cf
-		$this->process_postfix_config('mysql-virtual_relaydomains.cf');
-
-		//* mysql-virtual_relayrecipientmaps.cf
-		$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
-
-		//* mysql-virtual_outgoing_bcc.cf
-		$this->process_postfix_config('mysql-virtual_outgoing_bcc.cf');
-
-		//* mysql-virtual_policy_greylist.cf
-		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
-
-		//* mysql-virtual_gids.cf.master
-		$this->process_postfix_config('mysql-virtual_gids.cf');
-
-		//* mysql-virtual_uids.cf
-		$this->process_postfix_config('mysql-virtual_uids.cf');
+		//* Install virtual mappings
+		foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
+			$this->process_postfix_config( basename($filename, '.master') );
+		}
 
-		//* mysql-virtual_alias_domains.cf
+		//* mysql-verify_recipients.cf
 		$this->process_postfix_config('mysql-verify_recipients.cf');
 
 		// test if lmtp if available
@@ -1240,6 +1200,7 @@ class installer_base {
 		touch($config_dir.'/mime_header_checks');
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
+		touch($config_dir.'/sasl_passwd');
 
 		//* Create the mailman files
 		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
@@ -1796,11 +1757,18 @@ class installer_base {
 				$new_options[] = $value;
 			}
 			if ($mail_config['reject_sender_login_mismatch'] == 'y') {
-				array_splice($new_options, 0, 0, array('reject_authenticated_sender_login_mismatch'));
-
+				// insert before permit_mynetworks
 				for ($i = 0; isset($new_options[$i]); $i++) {
 					if ($new_options[$i] == 'permit_mynetworks') {
-						array_splice($new_options, $i+1, 0, array('reject_sender_login_mismatch'));
+						array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+						break;
+					}
+				}
+
+				// insert before permit_sasl_authenticated
+				for ($i = 0; isset($new_options[$i]); $i++) {
+					if ($new_options[$i] == 'permit_sasl_authenticated') {
+						array_splice($new_options, $i, 0, array('reject_sender_login_mismatch'));
 						break;
 					}
 				}
@@ -2946,6 +2914,21 @@ class installer_base {
 			$acme = explode("\n", shell_exec('which /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
 			$acme = reset($acme);
 
+			if((!$acme || !is_executable($acme)) && (!$le_client || !is_executable($le_client))) {
+				$success = $this->install_acme();
+				if(!$success) {
+					swriteln('Failed installing acme.sh. Will not be able to issue certificate during install.');
+				} else {
+					$acme = explode("\n", shell_exec('which /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
+					$acme = reset($acme);
+					if($acme && is_executable($acme)) {
+						swriteln('Installed acme.sh and using it for certificate creation during install.');
+					} else {
+						swriteln('Failed installing acme.sh. Will not be able to issue certificate during install.');
+					}
+				}
+			}
+
 			$restore_conf_symlink = false;
 
 			// we only need this for apache, so use fixed conf index
@@ -2976,15 +2959,24 @@ class installer_base {
 			$issued_successfully = false;
 
 			// Backup existing ispserver ssl files
-			if(file_exists($ssl_crt_file) || is_link($ssl_crt_file))
-				rename($ssl_crt_file, $ssl_crt_file.'-temporary.bak');
-			if(file_exists($ssl_key_file) || is_link($ssl_key_file))
-				rename($ssl_key_file, $ssl_key_file.'-temporary.bak');
-			if(file_exists($ssl_pem_file) || is_link($ssl_pem_file))
-				rename($ssl_pem_file, $ssl_pem_file.'-temporary.bak');
+			if(file_exists($ssl_crt_file) || is_link($ssl_crt_file)) {
+				rename($ssl_crt_file, $ssl_crt_file . '-temporary.bak');
+			}
+			if(file_exists($ssl_key_file) || is_link($ssl_key_file)) {
+				rename($ssl_key_file, $ssl_key_file . '-temporary.bak');
+			}
+			if(file_exists($ssl_pem_file) || is_link($ssl_pem_file)) {
+				rename($ssl_pem_file, $ssl_pem_file . '-temporary.bak');
+			}
 
 			// Attempt to use Neilpang acme.sh first, as it is now the preferred LE client
 			if (is_executable($acme)) {
+				$acme_cert_dir = dirname($acme) . '/' . $hostname;
+
+				swriteln('acme.sh is installed, overriding certificate path to use ' . $acme_cert_dir);
+
+				# acme.sh does not set umask, resulting in incorrect permissions (ispconfig issue #6015)
+				$old_umask = umask(0022);
 
 				$out = null;
 				$ret = null;
@@ -3007,6 +2999,7 @@ class installer_base {
 					$acme_chain = "--fullchain-file " . escapeshellarg($ssl_crt_file);
 					exec("$acme --install-cert -d " . escapeshellarg($hostname) . " $acme_key $acme_chain");
 					$issued_successfully = true;
+					umask($old_umask);
 
 					// Make temporary backup of self-signed certs permanent
 					if(file_exists($ssl_crt_file.'-temporary.bak') || is_link($ssl_crt_file.'-temporary.bak'))
@@ -3019,6 +3012,8 @@ class installer_base {
 				} else {
 					swriteln('Issuing certificate via acme.sh failed. Please check that your hostname can be verified by letsencrypt');
 
+					umask($old_umask);
+
 					// Restore temporary backup of self-signed certs
 					if(file_exists($ssl_crt_file.'-temporary.bak') || is_link($ssl_crt_file.'-temporary.bak'))
 						rename($ssl_crt_file.'-temporary.bak', $ssl_crt_file);
@@ -3082,7 +3077,7 @@ class installer_base {
 							rename($ssl_key_file.'-temporary.bak', $ssl_key_file);
 						if(file_exists($ssl_pem_file.'-temporary.bak') || is_link($ssl_pem_file.'-temporary.bak'))
 							rename($ssl_pem_file.'-temporary.bak', $ssl_pem_file);
-						
+
 					}
 				} else {
 					swriteln('Did not find any valid acme client (acme.sh or certbot)');
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 02a94fdc1a116166b9f30247e27b5c2304e2ba46..7d1ec4381568ba79c6812a569985778030585cf3 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -1 +1,21 @@
-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`;
+
+ALTER TABLE mail_access DROP CONSTRAINT `server_id`;
+SET SESSION old_alter_table=1;
+ALTER IGNORE TABLE mail_access ADD UNIQUE KEY `unique_source` (`server_id`,`source`,`type`);
+SET SESSION old_alter_table=0;
+
+ALTER TABLE mail_domain ADD COLUMN `relay_host` varchar(255) NOT NULL default '' AFTER `dkim_public`,
+  ADD COLUMN `relay_user` varchar(255) NOT NULL default '' AFTER `relay_host`,
+  ADD COLUMN `relay_pass` varchar(255) NOT NULL default '' AFTER `relay_user`;
+-- Purge apps & addons installer (#5795)
+DROP TABLE 'software_package';
+DROP TABLE 'software_repo';
+DROP TABLE 'software_update';
+DROP TABLE 'software_update_inst';
+
+-- Brexit
+UPDATE `country` SET `eu` = 'n' WHERE `iso` = 'GB';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index d4640ea47adee393ea36aa6abfbe12a1878a8480..04082fbeb7d371e871c89a34072c1b6e8bcf1919 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',
@@ -820,7 +822,7 @@ CREATE TABLE `mail_access` (
   `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient',
   `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`access_id`),
-  KEY `server_id` (`server_id`,`source`)
+  UNIQUE KEY `unique_source` (`server_id`,`source`,`type`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
@@ -882,6 +884,9 @@ CREATE TABLE `mail_domain` (
   `dkim_selector` varchar(63) NOT NULL DEFAULT 'default',
   `dkim_private` mediumtext NULL,
   `dkim_public` mediumtext NULL,
+  `relay_host` varchar(255) NOT NULL DEFAULT '',
+  `relay_user` varchar(255) NOT NULL DEFAULT '',
+  `relay_pass` varchar(255) NOT NULL DEFAULT '',
   `active` enum('n','y') NOT NULL DEFAULT 'n',
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
@@ -1462,88 +1467,6 @@ CREATE TABLE `shell_user` (
 
 -- --------------------------------------------------------
 
---
--- Table structure for table  `software_package`
---
-
-CREATE TABLE `software_package` (
-  `package_id` int(11) unsigned NOT NULL auto_increment,
-  `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
-  `package_name` varchar(64) NOT NULL DEFAULT '',
-  `package_title` varchar(64) NOT NULL DEFAULT '',
-  `package_description` text,
-  `package_version` varchar(8) default NULL,
-  `package_type` enum('ispconfig','app','web') NOT NULL default 'app',
-  `package_installable` enum('yes','no','key') NOT NULL default 'yes',
-  `package_requires_db` enum('no','mysql') NOT NULL default 'no',
-  `package_remote_functions` text,
-  `package_key` varchar(255) NOT NULL DEFAULT '',
-  `package_config` text,
-  PRIMARY KEY  (`package_id`),
-  UNIQUE KEY `package_name` (`package_name`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table  `software_repo`
---
-
-CREATE TABLE `software_repo` (
-  `software_repo_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `repo_name` varchar(64) default NULL,
-  `repo_url` varchar(255) default NULL,
-  `repo_username` varchar(64) default NULL,
-  `repo_password` varchar(64) default NULL,
-  `active` enum('n','y') NOT NULL default 'y',
-  PRIMARY KEY  (`software_repo_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table  `software_update`
---
-
-CREATE TABLE `software_update` (
-  `software_update_id` int(11) unsigned NOT NULL auto_increment,
-  `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
-  `package_name` varchar(64) NOT NULL DEFAULT '',
-  `update_url` varchar(255) NOT NULL DEFAULT '',
-  `update_md5` varchar(255) NOT NULL DEFAULT '',
-  `update_dependencies` varchar(255) NOT NULL DEFAULT '',
-  `update_title` varchar(64) NOT NULL DEFAULT '',
-  `v1` tinyint(1) NOT NULL default '0',
-  `v2` tinyint(1) NOT NULL default '0',
-  `v3` tinyint(1) NOT NULL default '0',
-  `v4` tinyint(1) NOT NULL default '0',
-  `type` enum('full','update') NOT NULL default 'full',
-  PRIMARY KEY  (`software_update_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table  `software_update_inst`
---
-
-CREATE TABLE `software_update_inst` (
-  `software_update_inst_id` int(11) unsigned NOT NULL auto_increment,
-  `software_update_id` int(11) unsigned NOT NULL default '0',
-  `package_name` varchar(64) NOT NULL DEFAULT '',
-  `server_id` int(11) unsigned NOT NULL DEFAULT '0',
-  `status` enum('none','installing','installed','deleting','deleted','failed') NOT NULL default 'none',
-  PRIMARY KEY  (`software_update_inst_id`),
-  UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
 --
 -- Table structure for table  `spamfilter_policy`
 --
@@ -2485,7 +2408,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`)
 ('UG', 'UGANDA', 'Uganda', 'UGA', 800, 'n'),
 ('UA', 'UKRAINE', 'Ukraine', 'UKR', 804, 'n'),
 ('AE', 'UNITED ARAB EMIRATES', 'United Arab Emirates', 'ARE', 784, 'n'),
-('GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826, 'y'),
+('GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826, 'n'),
 ('US', 'UNITED STATES', 'United States', 'USA', 840, 'n'),
 ('UM', 'UNITED STATES MINOR OUTLYING ISLANDS', 'United States Minor Outlying Islands', NULL, NULL, 'n'),
 ('UY', 'URUGUAY', 'Uruguay', 'URY', 858, 'n'),
@@ -2529,14 +2452,6 @@ INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL);
 
 -- --------------------------------------------------------
 
---
--- Dumping data for table `software_repo`
---
-
-INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `repo_name`, `repo_url`, `repo_username`, `repo_password`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'ISPConfig Addons', 'http://repo.ispconfig.org/addons/', '', '', 'n');
-
--- --------------------------------------------------------
-
 --
 -- Dumping data for table `spamfilter_policy`
 --
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index b1de2a167621b5ff3fa242e33f64be14ef3065a3..2a7ac0662e9f9cbc427330016bd903b979550dc7 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -3,6 +3,7 @@
 ################################################
 ServerTokens ProductOnly
 ServerSignature Off
+DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm standard_index.html
 
 ################################################
 # ISPConfig Logfile configuration for vlogger
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 946a3ee50509afc9238c782a65e6ca0fb2e81003..bd5cc8f47fb0206e122361c6d60cb520e2e60bcf 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -33,11 +33,11 @@ if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
 	Header("Pragma: no-cache");
 	Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
 	Header("Content-Type: text/html; charset=utf-8");
-	
+
 	//** Set a few php.ini values
 	ini_set('register_globals',0);
 	ini_set('magic_quotes_gpc', 0);
-	
+
 	if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
 		die('Internal Error: var override attempt detected');
 		exit;
@@ -127,8 +127,8 @@ $conf['init_scripts'] = '/etc/init.d';
 $conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools,help';
 
 //** Demo mode
-/* The demo mode is an option to restrict certain actions in the interface like 
-*  changing the password of users with sys_userid < 3 etc. to be 
+/* The demo mode is an option to restrict certain actions in the interface like
+*  changing the password of users with sys_userid < 3 etc. to be
 *  able to run the ISPConfig interface as online demo. It does not
 *  affect the server part. The demo mode should be always set to false
 *  on every normal installation
@@ -141,10 +141,6 @@ $conf['log_file'] = $conf['ispconfig_log_dir'].$conf['fs_div'].'ispconfig.log';
 $conf['log_priority'] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error
 
 
-//** Allow software package installations
-$conf['software_updates_enabled'] = false;
-
-
 //** Themes
 $conf['theme'] = '{theme}';
 $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
index a6a48e0e02332626db23d6a9df83b92bb82722c9..5023caf6bee402159e822caa7a396ccd8f910242 100644
--- a/install/tpl/debian_postfix.conf.master
+++ b/install/tpl/debian_postfix.conf.master
@@ -24,11 +24,11 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
 relay_domains = proxy:mysql:{config_dir}/mysql-virtual_relaydomains.cf
 relay_recipient_maps = proxy:mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
 smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
-proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions $smtp_sasl_password_maps $sender_dependent_relayhost_maps
 smtpd_helo_required = yes
-smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
-smtpd_sender_restrictions =  {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re, check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf
-smtpd_reject_unlisted_sender = yes
+smtpd_helo_restrictions = permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
+smtpd_sender_restrictions = check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf, {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re
+smtpd_reject_unlisted_sender = no
 smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-virtual_client.cf, permit_inet_interfaces, permit_mynetworks, permit_sasl_authenticated{rbl_list}, reject_unauth_pipelining {reject_unknown_client_hostname}, permit
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
@@ -53,3 +53,9 @@ tls_preempt_cipherlist = yes
 address_verify_negative_refresh_time=60s
 # needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
 enable_original_recipient = yes
+sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
+smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
+smtp_sender_dependent_authentication = yes
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous, noplaintext
+smtp_sasl_tls_security_options = noanonymous
diff --git a/install/tpl/fedora_postfix.conf.master b/install/tpl/fedora_postfix.conf.master
index 3cd8357a66b96917ea251064918ab99f62f0d63e..c5786c6ea8cf54262d0325a0ebccbe97d2cca640 100644
--- a/install/tpl/fedora_postfix.conf.master
+++ b/install/tpl/fedora_postfix.conf.master
@@ -20,11 +20,11 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
 relay_domains = proxy:mysql:{config_dir}/mysql-virtual_relaydomains.cf
 relay_recipient_maps = proxy:mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
 smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
-proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions $smtp_sasl_password_maps $sender_dependent_relayhost_maps
 smtpd_helo_required = yes
-smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
-smtpd_sender_restrictions =  {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re, check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf
-smtpd_reject_unlisted_sender = yes
+smtpd_helo_restrictions = permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
+smtpd_sender_restrictions = check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf, {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re
+smtpd_reject_unlisted_sender = no
 smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-virtual_client.cf, permit_inet_interfaces, permit_mynetworks, permit_sasl_authenticated{rbl_list}, reject_unauth_pipelining {reject_unknown_client_hostname}, permit
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
@@ -49,3 +49,9 @@ tls_preempt_cipherlist = yes
 address_verify_negative_refresh_time=60s
 # needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
 enable_original_recipient = yes
+sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
+smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
+smtp_sender_dependent_authentication = yes
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous, noplaintext
+smtp_sasl_tls_security_options = noanonymous
diff --git a/install/tpl/gentoo_postfix.conf.master b/install/tpl/gentoo_postfix.conf.master
index f4a1d4025c6e870dedcc031a7265a3f5f7fe65ff..405640f52a9dd4310289db241ee6fce61fec8aea 100644
--- a/install/tpl/gentoo_postfix.conf.master
+++ b/install/tpl/gentoo_postfix.conf.master
@@ -19,11 +19,11 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
 relay_domains = proxy:mysql:{config_dir}/mysql-virtual_relaydomains.cf
 relay_recipient_maps = proxy:mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
 smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
-proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions $smtp_sasl_password_maps $sender_dependent_relayhost_maps
 smtpd_helo_required = yes
-smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
-smtpd_sender_restrictions =  {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re, check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf
-smtpd_reject_unlisted_sender = yes
+smtpd_helo_restrictions = permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
+smtpd_sender_restrictions = check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf, {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re
+smtpd_reject_unlisted_sender = no
 smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-virtual_client.cf, permit_inet_interfaces, permit_mynetworks, permit_sasl_authenticated{rbl_list}, reject_unauth_pipelining {reject_unknown_client_hostname}, permit
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
@@ -48,3 +48,9 @@ tls_preempt_cipherlist = yes
 address_verify_negative_refresh_time=60s
 # needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
 enable_original_recipient = yes
+sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
+smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
+smtp_sender_dependent_authentication = yes
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous, noplaintext
+smtp_sasl_tls_security_options = noanonymous
diff --git a/install/tpl/jk_init.ini.master b/install/tpl/jk_init.ini.master
index b84aab95b67061e2c4253ccce156131a44f61216..e835d2701d6392c5b7f5b8b0a179ee760d449aac 100644
--- a/install/tpl/jk_init.ini.master
+++ b/install/tpl/jk_init.ini.master
@@ -149,8 +149,8 @@ paths_w_setuid = /bin/ping
 #paths = /usr/bin/X11/xterm, /usr/share/terminfo, /etc/terminfo
 #devices = /dev/pts/0, /dev/pts/1, /dev/pts/2, /dev/pts/3, /dev/pts/4, /dev/ptyb4, /dev/ptya4, /dev/tty, /dev/tty0, /dev/tty4
 
-+# coreutils from:
-+# (echo -ne '\n[coreutils]\ncomment = non-sbin progs from coreutils\npaths = '; dpkg --listfiles coreutils | grep -E '^/bin/|/usr/bin/' | xargs -n1 -i@ echo -n "@, " | sed -e 's/, *$/\n/g' -e 's|/usr/bin/||g' -e 's|/bin/||g') >> /etc/jailkit/jk_init.ini
+# coreutils from:
+# (echo -ne '\n[coreutils]\ncomment = non-sbin progs from coreutils\npaths = '; dpkg --listfiles coreutils | grep -E '^/bin/|/usr/bin/' | xargs -n1 -i@ echo -n "@, " | sed -e 's/, *$/\n/g' -e 's|/usr/bin/||g' -e 's|/bin/||g') >> /etc/jailkit/jk_init.ini
 
 [coreutils]
 comment = non-sbin progs from coreutils
@@ -225,3 +225,8 @@ includesections = php_common
 comment = php version 7.4
 paths = /usr/bin/php7.4, /usr/lib/php/7.4/, /usr/lib/php/20190902/, /usr/share/php/7.4/, /etc/php/7.4/cli/, /etc/php/7.4/mods-available/
 includesections = php_common
+
+[php8_0]
+comment = php version 8.0
+paths = /usr/bin/php8.0, /usr/lib/php/8.0/, /usr/lib/php/20200930/, /usr/share/php/8.0/, /etc/php/8.0/cli/, /etc/php/8.0/mods-available/
+includesections = php_common
diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master
index 1ae7f9addcad263574d85b5f50556464859a9794..f420a104d9ac0235362178ba35c7fa672375e888 100644
--- a/install/tpl/mysql-virtual_email2email.cf.master
+++ b/install/tpl/mysql-virtual_email2email.cf.master
@@ -2,8 +2,8 @@ user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
 hosts = {mysql_server_ip}
-query = SELECT email FROM mail_user WHERE email = '%s' AND forward_in_lda = 'n' AND disabledeliver = 'n' AND postfix = 'y' AND server_id = {server_id}
+query = SELECT email FROM mail_user WHERE email = '%s' AND forward_in_lda = 'n' AND disabledeliver = 'n' AND disablesmtp = 'n' AND server_id = {server_id}
            AND EXISTS (SELECT domain_id FROM mail_domain WHERE domain = SUBSTRING_INDEX('%s', '@', -1) AND active = 'y' AND server_id = {server_id})
         UNION
-        SELECT cc AS email FROM mail_user WHERE email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND postfix = 'y' AND server_id = {server_id}
+        SELECT cc AS email FROM mail_user WHERE email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND disablesmtp = 'n' AND server_id = {server_id}
            AND EXISTS (SELECT domain_id FROM mail_domain WHERE domain = SUBSTRING_INDEX('%s', '@', -1) AND active = 'y' AND server_id = {server_id})
diff --git a/install/tpl/mysql-virtual_sender-relayauth.cf.master b/install/tpl/mysql-virtual_sender-relayauth.cf.master
new file mode 100644
index 0000000000000000000000000000000000000000..413607c763f616d65263e86eb063cfcd0f5c5b2a
--- /dev/null
+++ b/install/tpl/mysql-virtual_sender-relayauth.cf.master
@@ -0,0 +1,10 @@
+user = {mysql_server_ispconfig_user}
+password = {mysql_server_ispconfig_password}
+dbname = {mysql_server_database}
+hosts = {mysql_server_ip}
+query = SELECT CONCAT(relay_user,':',relay_pass) as credential
+  FROM mail_domain
+  WHERE domain = '%d'
+  AND active = 'y'
+  AND concat(relay_host,relay_user,relay_pass) != ''
+  AND server_id = {server_id}
diff --git a/install/tpl/mysql-virtual_sender-relayhost.cf.master b/install/tpl/mysql-virtual_sender-relayhost.cf.master
new file mode 100644
index 0000000000000000000000000000000000000000..3bb4c81330bc071d484446c25a1eb3d40ccf6ebd
--- /dev/null
+++ b/install/tpl/mysql-virtual_sender-relayhost.cf.master
@@ -0,0 +1,10 @@
+user = {mysql_server_ispconfig_user}
+password = {mysql_server_ispconfig_password}
+dbname = {mysql_server_database}
+hosts = {mysql_server_ip}
+query = SELECT relay_host as relayhost
+  FROM mail_domain
+  WHERE domain = '%d'
+  AND active = 'y'
+  AND concat(relay_host,relay_user,relay_pass) != ''
+  AND server_id = {server_id}
diff --git a/install/tpl/opensuse_postfix.conf.master b/install/tpl/opensuse_postfix.conf.master
index 7d3669853a6ab2ec03fa7ed5264bde0d13a2d509..a98f4223e13ee1d9221885d4ee6775b08de239ce 100644
--- a/install/tpl/opensuse_postfix.conf.master
+++ b/install/tpl/opensuse_postfix.conf.master
@@ -22,11 +22,11 @@ transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{conf
 relay_domains = proxy:mysql:{config_dir}/mysql-virtual_relaydomains.cf
 relay_recipient_maps = proxy:mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
 smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
-proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps $virtual_uid_maps $virtual_gid_maps $smtpd_client_restrictions $smtpd_sender_restrictions $smtpd_recipient_restrictions $smtp_sasl_password_maps $sender_dependent_relayhost_maps
 smtpd_helo_required = yes
-smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
-smtpd_sender_restrictions =  {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re, check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf
-smtpd_reject_unlisted_sender = yes
+smtpd_helo_restrictions = permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, {reject_unknown_helo_hostname}, permit
+smtpd_sender_restrictions = check_sender_access proxy:mysql:{config_dir}/mysql-virtual_sender.cf, {reject_aslm} check_sender_access regexp:{config_dir}/tag_as_originating.re, permit_mynetworks{reject_slm}, permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:{config_dir}/tag_as_foreign.re
+smtpd_reject_unlisted_sender = no
 smtpd_client_restrictions = check_client_access proxy:mysql:{config_dir}/mysql-virtual_client.cf, permit_inet_interfaces, permit_mynetworks, permit_sasl_authenticated{rbl_list}, reject_unauth_pipelining {reject_unknown_client_hostname}, permit
 smtpd_etrn_restrictions = permit_mynetworks, reject
 smtpd_data_restrictions = permit_mynetworks, reject_unauth_pipelining, reject_multi_recipient_bounce, permit
@@ -51,3 +51,9 @@ tls_preempt_cipherlist = yes
 address_verify_negative_refresh_time=60s
 # needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
 enable_original_recipient = yes
+sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
+smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
+smtp_sender_dependent_authentication = yes
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous, noplaintext
+smtp_sasl_tls_security_options = noanonymous
diff --git a/install/tpl/rspamd_classifier-bayes.conf.master b/install/tpl/rspamd_classifier-bayes.conf.master
index 1688d57e217673cdfa50ff36c31f4beb782aae70..dcda4a6391f009be67f2ccbd4047a030c3b7acaa 100644
--- a/install/tpl/rspamd_classifier-bayes.conf.master
+++ b/install/tpl/rspamd_classifier-bayes.conf.master
@@ -1,3 +1,3 @@
 autolearn = [-0.01, 5.00];
-per_user = true;
-per_language = true;
\ No newline at end of file
+per_user = false;
+per_language = true;
diff --git a/install/tpl/security_settings.ini.master b/install/tpl/security_settings.ini.master
index c135652e17cf15aa650168c206b44ff3725b3345..02b1058074810b1b9bfde9a173f9fb864093c92c 100644
--- a/install/tpl/security_settings.ini.master
+++ b/install/tpl/security_settings.ini.master
@@ -12,8 +12,6 @@ admin_allow_del_cpuser=superadmin
 admin_allow_cpuser_group=superadmin
 admin_allow_firewall_config=superadmin
 admin_allow_osupdate=superadmin
-admin_allow_software_packages=superadmin
-admin_allow_software_repo=superadmin
 remote_api_allowed=yes
 password_reset_allowed=yes
 session_regenerate_id=yes
@@ -44,4 +42,3 @@ warn_new_admin=yes
 warn_passwd_change=no
 warn_shadow_change=no
 warn_group_change=no
-
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index 04a022c06ecb4d1e010f6b8fc785769da074bfc4..fc55454175441a411a6d7685fe5f26b6a8305b8b 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -1110,4 +1110,4 @@ class remoting_mail extends remoting {
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index ccda3717e1ed7a3857e6f23939cb807c54c0b870..c5d14d79cdbdb02d98e2a1129d91871101170258 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -128,10 +128,6 @@ $conf['log_file'] = $conf['ispconfig_log_dir'].'/ispconfig.log';
 $conf['log_priority'] = 0; // 0 = Debug, 1 = Warning, 2 = Error
 
 
-//** Allow software package installations
-$conf['software_updates_enabled'] = false;
-
-
 //** Themes
 $conf['theme'] = 'default';
 $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
diff --git a/interface/web/admin/form/software_package.tform.php b/interface/web/admin/form/software_package.tform.php
deleted file mode 100644
index 888bc6df1a0966249674670ca96213b8fa4dba2a..0000000000000000000000000000000000000000
--- a/interface/web/admin/form/software_package.tform.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-	Form Definition
-
-	Tabellendefinition
-
-	Datentypen:
-	- INTEGER (Wandelt Ausdrücke in Int um)
-	- DOUBLE
-	- CURRENCY (Formatiert Zahlen nach Währungsnotation)
-	- VARCHAR (kein weiterer Format Check)
-	- TEXT (kein weiterer Format Check)
-	- DATE (Datumsformat, Timestamp Umwandlung)
-
-	Formtype:
-	- TEXT (normales Textfeld)
-	- TEXTAREA (normales Textfeld)
-	- PASSWORD (Feldinhalt wird nicht angezeigt)
-	- SELECT (Gibt Werte als option Feld aus)
-	- RADIO
-	- CHECKBOX
-	- FILE
-
-	VALUE:
-	- Wert oder Array
-
-	Hinweis:
-	Das ID-Feld ist nicht bei den Table Values einzufügen.
-
-
-*/
-
-$form["title"]    = "Software Package";
-//$form["description"]  = "Modify software package details";
-$form["name"]    = "software_package";
-$form["action"]   = "software_package_edit.php";
-$form["db_table"]  = "software_package";
-$form["db_table_idx"] = "package_id";
-$form["db_history"]  = "no";
-$form["tab_default"] = "software_package";
-$form["list_default"] = "software_package_list.php";
-$form["auth"]   = 'yes';
-
-$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['software_package'] = array (
-	'title'  => "Software Package",
-	'width'  => 80,
-	'template'  => "templates/software_package_edit.htm",
-	'fields'  => array (
-		//#################################
-		// Beginn Datenbankfelder
-		//#################################
-		'package_title' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'TEXT',
-			'filters'   => array(
-					0 => array( 'event' => 'SAVE',
-					'type' => 'STRIPTAGS'),
-					1 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
-			),
-			'validators' => '',
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '40',
-			'maxlength' => '40',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		'package_key' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'TEXT',
-			'filters'   => array(
-					0 => array( 'event' => 'SAVE',
-					'type' => 'STRIPTAGS'),
-					1 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
-			),
-			'validators' => '',
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '40',
-			'maxlength' => '40',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		//#################################
-		// ENDE Datenbankfelder
-		//#################################
-	)
-);
-?>
diff --git a/interface/web/admin/form/software_repo.tform.php b/interface/web/admin/form/software_repo.tform.php
deleted file mode 100644
index 2c208ce216f056c148ec38e9a48fbe6dbe1670aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/form/software_repo.tform.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-	Form Definition
-
-	Tabellendefinition
-
-	Datentypen:
-	- INTEGER (Wandelt Ausdrücke in Int um)
-	- DOUBLE
-	- CURRENCY (Formatiert Zahlen nach Währungsnotation)
-	- VARCHAR (kein weiterer Format Check)
-	- TEXT (kein weiterer Format Check)
-	- DATE (Datumsformat, Timestamp Umwandlung)
-
-	Formtype:
-	- TEXT (normales Textfeld)
-	- TEXTAREA (normales Textfeld)
-	- PASSWORD (Feldinhalt wird nicht angezeigt)
-	- SELECT (Gibt Werte als option Feld aus)
-	- RADIO
-	- CHECKBOX
-	- FILE
-
-	VALUE:
-	- Wert oder Array
-
-	Hinweis:
-	Das ID-Feld ist nicht bei den Table Values einzufügen.
-
-
-*/
-
-$form["title"]    = "Software Repository";
-//$form["description"]  = "Software Repository which may contain addons or updates";
-$form["name"]    = "software_repo";
-$form["action"]   = "software_repo_edit.php";
-$form["db_table"]  = "software_repo";
-$form["db_table_idx"] = "software_repo_id";
-$form["db_history"]  = "no";
-$form["tab_default"] = "software_repo";
-$form["list_default"] = "software_repo_list.php";
-$form["auth"]   = 'yes';
-
-$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['software_repo'] = array (
-	'title'  => "Repository",
-	'width'  => 80,
-	'template'  => "templates/software_repo_edit.htm",
-	'fields'  => array (
-		//#################################
-		// Beginn Datenbankfelder
-		//#################################
-		'repo_name' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'TEXT',
-			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
-					'errmsg'=> 'repo_name_empty'),
-				1 => array ( 'type' => 'UNIQUE',
-					'errmsg'=> 'repo_name_unique'),
-			),
-			'filters'   => array(
-					0 => array( 'event' => 'SAVE',
-					'type' => 'STRIPTAGS'),
-					1 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
-			),
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '40',
-			'maxlength' => '40',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		'repo_url' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'TEXT',
-			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
-					'errmsg'=> 'repo_name_empty'),
-				1 => array ( 'type' => 'UNIQUE',
-					'errmsg'=> 'repo_name_unique'),
-			),
-			'filters'   => array(
-					0 => array( 'event' => 'SAVE',
-					'type' => 'STRIPTAGS'),
-					1 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
-			),
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '40',
-			'maxlength' => '40',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		'repo_username' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'TEXT',
-			'filters'   => array(
-					0 => array( 'event' => 'SAVE',
-					'type' => 'STRIPTAGS'),
-					1 => array( 'event' => 'SAVE',
-					'type' => 'STRIPNL')
-			),
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '30',
-			'maxlength' => '30',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		'repo_password' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'PASSWORD',
-			'encryption' => 'CLEARTEXT',
-			'default' => '',
-			'value'  => '',
-			'separator' => '',
-			'width'  => '30',
-			'maxlength' => '30',
-			'rows'  => '',
-			'cols'  => ''
-		),
-		'active' => array (
-			'datatype' => 'VARCHAR',
-			'formtype' => 'CHECKBOX',
-			'default' => 'y',
-			'value'  => array(0 => 'n', 1 => 'y')
-		),
-		//#################################
-		// ENDE Datenbankfelder
-		//#################################
-	)
-);
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package.lng b/interface/web/admin/lib/lang/ar_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package_install.lng b/interface/web/admin/lib/lang/ar_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package_list.lng b/interface/web/admin/lib/lang/ar_software_package_list.lng
deleted file mode 100644
index 9fa53867bc70f653a4410da5dc70988beebfdcdb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_repo.lng b/interface/web/admin/lib/lang/ar_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_repo_list.lng b/interface/web/admin/lib/lang/ar_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_update_list.lng b/interface/web/admin/lib/lang/ar_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package.lng b/interface/web/admin/lib/lang/bg_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package_install.lng b/interface/web/admin/lib/lang/bg_software_package_install.lng
deleted file mode 100644
index 0c9bd116c37c4378c7e84b41215accb29e06e68f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Исталиране на софтуерни пакети';
-$wb['install_key_txt'] = 'Инсталационен ключ';
-$wb['btn_save_txt'] = 'Стартирай инсталацията';
-$wb['btn_cancel_txt'] = 'Отказ';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package_list.lng b/interface/web/admin/lib/lang/bg_software_package_list.lng
deleted file mode 100644
index e251c95fbd2a3d9bd3f8d01e883e8111fd489813..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Софтуерни пакети';
-$wb['installed_txt'] = 'Статус';
-$wb['package_title_txt'] = 'Пакет';
-$wb['package_description_txt'] = 'Описание';
-$wb['action_txt'] = 'Действие';
-$wb['toolsarea_head_txt'] = 'Пакети';
-$wb['repoupdate_txt'] = 'Обновяване на пакетите ';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_repo.lng b/interface/web/admin/lib/lang/bg_software_repo.lng
deleted file mode 100644
index f5156543451cdbd127b34dfed1798a2c6dc5c58c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Потребител (не е задължително)';
-$wb['repo_password_txt'] = 'Парола (не е задължително)';
-$wb['active_txt'] = 'Активен';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_repo_list.lng b/interface/web/admin/lib/lang/bg_software_repo_list.lng
deleted file mode 100644
index 6471d706143866e7e1d94c76de6470d85cba5056..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Хранилище';
-$wb['active_txt'] = 'Активен';
-$wb['repo_name_txt'] = 'Хранилище';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_update_list.lng b/interface/web/admin/lib/lang/bg_software_update_list.lng
deleted file mode 100644
index c7fa6e07f5741e21f04f6c78c5bef8eb8f329210..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ъпдейт на софтуера';
-$wb['installed_txt'] = 'Действие';
-$wb['update_title_txt'] = 'Ъпдейт';
-$wb['version_txt'] = 'Версия';
-$wb['action_txt'] = 'Действие';
-$wb['server_select_txt'] = 'Избери сървър';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/br_software_package.lng b/interface/web/admin/lib/lang/br_software_package.lng
deleted file mode 100644
index d26e1d44509e56ecb7c4c55fda24a45eb4c2ea20..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Título do pacote';
-$wb['package_key_txt'] = 'Chave do pacote';
-$wb['Software Package'] = 'Pacote de software';
-$wb['Modify software package details'] = 'Modificar detalhes do pacote de software';
diff --git a/interface/web/admin/lib/lang/br_software_package_install.lng b/interface/web/admin/lib/lang/br_software_package_install.lng
deleted file mode 100644
index 77d24f2e153dd746822ca94f298a7b0346eda360..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package_install.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalar pacote de software';
-$wb['install_key_txt'] = 'Insira a chave de instalação';
-$wb['btn_save_txt'] = 'Iniciar instalação';
-$wb['btn_cancel_txt'] = 'Cancelar';
diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng
deleted file mode 100644
index 5dda114faf2cf335201854fead8adb6fcc48e2c0..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package_list.lng
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacotes de APPs e complementos';
-$wb['installed_txt'] = 'Estado';
-$wb['package_title_txt'] = 'Pacote';
-$wb['package_description_txt'] = 'Descrição';
-$wb['action_txt'] = 'Ação';
-$wb['toolsarea_head_txt'] = 'Pacotes';
-$wb['repoupdate_txt'] = 'Atualizar lista de pacotes';
-$wb['package_id_txt'] = 'ID local do APP';
-$wb['no_packages_txt'] = 'Nenhum pacote disponível.';
-$wb['edit_txt'] = 'Editar';
-$wb['delete_txt'] = 'Remover';
diff --git a/interface/web/admin/lib/lang/br_software_repo.lng b/interface/web/admin/lib/lang/br_software_repo.lng
deleted file mode 100644
index 13b4a2d87f70b47dbc818761edae15f0957a117d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_repo.lng
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Usuário (opcional)';
-$wb['repo_password_txt'] = 'Senha (opcional)';
-$wb['active_txt'] = 'Ativo';
-$wb['Software Repository which may contain addons or updates'] = 'Repositório de software pode conter complementos ou atualizações';
diff --git a/interface/web/admin/lib/lang/br_software_repo_list.lng b/interface/web/admin/lib/lang/br_software_repo_list.lng
deleted file mode 100644
index 86886e76714b2b05124d37ea28e871a471fbd1c7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_repo_list.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositório';
-$wb['active_txt'] = 'Ativo';
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
diff --git a/interface/web/admin/lib/lang/br_software_update_list.lng b/interface/web/admin/lib/lang/br_software_update_list.lng
deleted file mode 100644
index 77315b76c4f6d98bc6466c8018d71c84a8a87390..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_update_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Atualizações de Software';
-$wb['server_select_txt'] = 'Selecionar o servidor';
-$wb['installed_txt'] = 'Ação';
-$wb['update_title_txt'] = 'Atualizar';
-$wb['version_txt'] = 'Versão';
-$wb['action_txt'] = 'Ação';
-$wb['no_updates_txt'] = 'Nenhuma atualização disponível.';
diff --git a/interface/web/admin/lib/lang/ca_software_package.lng b/interface/web/admin/lib/lang/ca_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_package_install.lng b/interface/web/admin/lib/lang/ca_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_package_list.lng b/interface/web/admin/lib/lang/ca_software_package_list.lng
deleted file mode 100644
index 2909d8376e51f4a801bf99fb0e0a3f191558d2a4..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_repo.lng b/interface/web/admin/lib/lang/ca_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_repo_list.lng b/interface/web/admin/lib/lang/ca_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_update_list.lng b/interface/web/admin/lib/lang/ca_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/cz_software_package.lng b/interface/web/admin/lib/lang/cz_software_package.lng
deleted file mode 100644
index d4dc8af0b2cf9168ea900b84d92747fa3e091267..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
deleted file mode 100644
index 74837beaff75ef67bbc62d8a195b3f9332c67da7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalace software';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Spustit instalaci';
-$wb['btn_cancel_txt'] = 'Zrušit';
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
deleted file mode 100644
index 433cdcffd0809730e56c4500b49d890e03452746..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarové balíčky';
-$wb['installed_txt'] = 'Stav';
-$wb['package_title_txt'] = 'Balíček';
-$wb['package_description_txt'] = 'Popis';
-$wb['action_txt'] = 'Akce';
-$wb['toolsarea_head_txt'] = 'Balíčky';
-$wb['repoupdate_txt'] = 'Aktualizace seznamu balíků';
-$wb['package_id_txt'] = 'místní App-ID';
-$wb['no_packages_txt'] = 'Žádné balíčky nejsou k dispozici';
-$wb['edit_txt'] = 'Upravit';
-$wb['delete_txt'] = 'Smazat';
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
deleted file mode 100644
index beca429d9a376beb6eb1dac0054b826418951ea9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Název zdroje';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživatel (volitelné)';
-$wb['repo_password_txt'] = 'Heslo (volitelné)';
-$wb['active_txt'] = 'Aktivní';
-$wb['Software Repository which may contain addons or updates'] = 'Softwarové zdroje, které mohou obsahovat addony nebo aktualizace';
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
deleted file mode 100644
index 8d434ca336ee81b42ed85434ed412eaf8d65e70c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Zdroje repozitářů';
-$wb['active_txt'] = 'Aktivní';
-$wb['repo_name_txt'] = 'Název zdroje';
-$wb['repo_url_txt'] = 'URL';
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
deleted file mode 100644
index 921db7594d7d5b13a2f37915a928507702f91202..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarové aktualizace';
-$wb['server_select_txt'] = 'Vybrat server';
-$wb['installed_txt'] = 'Akce';
-$wb['update_title_txt'] = 'Aktualizovat';
-$wb['version_txt'] = 'Verze';
-$wb['action_txt'] = 'Akce';
-$wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
diff --git a/interface/web/admin/lib/lang/de_software_package.lng b/interface/web/admin/lib/lang/de_software_package.lng
deleted file mode 100644
index 13b3d996c30489a23bf3c02ab9f2935463bf8e5a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Softwarepaket Titel';
-$wb['package_key_txt'] = 'Softwarepaket Schlüssel';
-$wb['Software Package'] = 'Softwarepaket';
-$wb['Modify software package details'] = 'Softwarepaket Einstellungen bearbeiten';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng
deleted file mode 100644
index 1ef69d13d32b0fd9cebc50cefc2e3b7b61623513..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Softwarepaket installieren';
-$wb['install_key_txt'] = 'Installationskey eingeben';
-$wb['btn_save_txt'] = 'Installation starten';
-$wb['btn_cancel_txt'] = 'Abbrechen';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
deleted file mode 100644
index 75b7504390489492a4d84de033807463aaef0540..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarepakete';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Beschreibung';
-$wb['action_txt'] = 'Aktion';
-$wb['toolsarea_head_txt'] = 'Pakete';
-$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
-$wb['package_id_txt'] = 'Lokale App ID';
-$wb['no_packages_txt'] = 'Keine Pakete verfügbar';
-$wb['edit_txt'] = 'Bearbeiten';
-$wb['delete_txt'] = 'Löschen';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng
deleted file mode 100644
index 242611cd08616fc1159c5dca536282ce672098f8..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Benutzername (optional)';
-$wb['repo_password_txt'] = 'Passwort (optional)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Software Archiv, das Add-Ons oder Updates enthalten kann';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng
deleted file mode 100644
index db6f49fd4edd70c55ebc84f05dc84fc704e861ce..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Aktiv';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
deleted file mode 100644
index cf31e88154c60bfcdc82fb9b9f778dbbf737eb9b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwareupdates';
-$wb['server_select_txt'] = 'Server wählen';
-$wb['installed_txt'] = 'Aktion';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Aktion';
-$wb['no_updates_txt'] = 'Keine Updates verfügbar';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package.lng b/interface/web/admin/lib/lang/dk_software_package.lng
deleted file mode 100644
index 86f45dc91ef21cd0c1f506379c272d5dc71921e9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Pakke Titel';
-$wb['package_key_txt'] = 'Pakke Nøgle';
-$wb['Software Package'] = 'Software Pakke';
-$wb['Modify software package details'] = 'Ændre software pakke detaljer';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package_install.lng b/interface/web/admin/lib/lang/dk_software_package_install.lng
deleted file mode 100644
index fd9211652c73e2f188f48de99b97f2bff8738cee..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software pakke';
-$wb['install_key_txt'] = 'Indtast installations nøgle';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Annullere';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package_list.lng b/interface/web/admin/lib/lang/dk_software_package_list.lng
deleted file mode 100644
index 3fb5399eaecb8a650547e99648e532aa95a6ccfa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Tilføjelses pakker';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakke';
-$wb['package_description_txt'] = 'Beskrivelse';
-$wb['action_txt'] = 'Handling';
-$wb['toolsarea_head_txt'] = 'Pakker';
-$wb['repoupdate_txt'] = 'Opdater pakke listen';
-$wb['package_id_txt'] = 'lokal App-ID';
-$wb['no_packages_txt'] = 'Ingen pakker tilgængelig';
-$wb['edit_txt'] = 'Rediger';
-$wb['delete_txt'] = 'Slet';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_repo.lng b/interface/web/admin/lib/lang/dk_software_repo.lng
deleted file mode 100644
index 2c506cdc6b6d9decbf8dda1827104b17c0aaf6b7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Arkiv';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Bruger (valgfri)';
-$wb['repo_password_txt'] = 'Adgangskode (valgfri)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Software Arkiv som kan indeholde tilføjelser eller opdateringer';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_repo_list.lng b/interface/web/admin/lib/lang/dk_software_repo_list.lng
deleted file mode 100644
index aa33919cbd6b8e088b3e5dd5fc9b371b97c405f7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Arkiv';
-$wb['active_txt'] = 'Aktiv';
-$wb['repo_name_txt'] = 'Arkiv';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_update_list.lng b/interface/web/admin/lib/lang/dk_software_update_list.lng
deleted file mode 100644
index 8a8e8686af47c83de5cb82922cac2bd30f4709a9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software opdateringer';
-$wb['server_select_txt'] = 'Vælg server';
-$wb['installed_txt'] = 'Handling';
-$wb['update_title_txt'] = 'Opdater';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Handling';
-$wb['no_updates_txt'] = 'Ingen opdateringer tilgængelig';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package.lng b/interface/web/admin/lib/lang/el_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng
deleted file mode 100644
index 5e3d0fd4022ce48fac39c9379b5de0774c46510b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Εγκατάσταση πακέτου λογισμικού';
-$wb['install_key_txt'] = 'Εισαγωγή κλειδιού εγκατάστασης';
-$wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης';
-$wb['btn_cancel_txt'] = 'Ακύρωση';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
deleted file mode 100644
index 1553ea1ceafeca4b43be5bd163c9b3fc47ae9864..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Πακέτα Εφαρμογών & Πρόσθετων';
-$wb['installed_txt'] = 'Κατάσταση';
-$wb['package_title_txt'] = 'Πακέτο';
-$wb['package_description_txt'] = 'Περιγραφή';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['toolsarea_head_txt'] = 'Πακέτα';
-$wb['repoupdate_txt'] = 'Ενημέρωση λίστας πακκέτων';
-$wb['package_id_txt'] = 'τοπικό App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng
deleted file mode 100644
index 3b12d3fd874fd4e1945f6ce2f234e2f3d619ae24..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Αποθετήριο';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Χρήστης (Προαιρετικό)';
-$wb['repo_password_txt'] = 'Συνθηματικό (Προαιρετικό)';
-$wb['active_txt'] = 'Ενεργό';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng
deleted file mode 100644
index deb896a719c990ba6df4b00d5114b8dc1ac62f43..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Αποθετήριο';
-$wb['active_txt'] = 'Ενεργό';
-$wb['repo_name_txt'] = 'Αποθετήριο';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
deleted file mode 100644
index 42100d0c8903ad84f65f8f5137feee995b83d3d5..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Αναβαθμίσεις Λογισμικού';
-$wb['server_select_txt'] = 'Επιλογή server';
-$wb['installed_txt'] = 'Ενέργεια';
-$wb['update_title_txt'] = 'Ενημέρωση';
-$wb['version_txt'] = 'Έκδοση';
-$wb['action_txt'] = 'Ενέργεια';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/en_software_package.lng b/interface/web/admin/lib/lang/en_software_package.lng
deleted file mode 100644
index 5850719890ce87b8f5bc29f3356493f8316e9e85..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_package_install.lng b/interface/web/admin/lib/lang/en_software_package_install.lng
deleted file mode 100644
index d6ec373abb7aafe007f477c5f25a957bf521b4a7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_package_list.lng b/interface/web/admin/lib/lang/en_software_package_list.lng
deleted file mode 100644
index 2909d8376e51f4a801bf99fb0e0a3f191558d2a4..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/en_software_repo.lng b/interface/web/admin/lib/lang/en_software_repo.lng
deleted file mode 100644
index 38c163507edd0eb8db509aba945cbb813275dabe..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_repo_list.lng b/interface/web/admin/lib/lang/en_software_repo_list.lng
deleted file mode 100644
index 15b16e2d5b59473324eff98853281749bedf5b3d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_update_list.lng b/interface/web/admin/lib/lang/en_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package.lng b/interface/web/admin/lib/lang/es_software_package.lng
deleted file mode 100644
index af80e4a47930c8e36e56eb77562ad336903dfed2..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['Modify software package details'] = 'Modificar los detalles del paquete de aplicación';
-$wb['package_key_txt'] = 'Clave del paquete';
-$wb['package_title_txt'] = 'Título del paquete';
-$wb['Software Package'] = 'Paquete de aplicación';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package_install.lng b/interface/web/admin/lib/lang/es_software_package_install.lng
deleted file mode 100644
index 838af344ecf3247fb4f49d96bd3a405d79edd36e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['btn_cancel_txt'] = 'Cancelar';
-$wb['btn_save_txt'] = 'Iniciar instalación';
-$wb['head_txt'] = 'Instalar paquete de aplicación';
-$wb['install_key_txt'] = 'Ingrese la clave de instalación';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package_list.lng b/interface/web/admin/lib/lang/es_software_package_list.lng
deleted file mode 100644
index c1837c7a8248a5dd8649e64d431253967cab659e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['action_txt'] = 'Acción';
-$wb['delete_txt'] = 'Borrar';
-$wb['edit_txt'] = 'Editar';
-$wb['installed_txt'] = 'Estado';
-$wb['list_head_txt'] = 'Apps & paquetes adicionales';
-$wb['no_packages_txt'] = 'No hay paquetes disponibles';
-$wb['package_description_txt'] = 'Descripción';
-$wb['package_id_txt'] = 'ID local de App';
-$wb['package_title_txt'] = 'Paquete';
-$wb['repoupdate_txt'] = 'Actualizar lista de paquetes';
-$wb['toolsarea_head_txt'] = 'Paquetes';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_repo.lng b/interface/web/admin/lib/lang/es_software_repo.lng
deleted file mode 100644
index 26382bd50330f5dd9646ac1a61b8ad39d85543dd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['active_txt'] = 'Habilitado';
-$wb['repo_name_txt'] = 'Repositorio';
-$wb['repo_password_txt'] = 'Contraseña (opcional)';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Usuario (opcional)';
-$wb['Software Repository which may contain addons or updates'] = 'Repositorio de aplicaciones que puede contener complementos o actualizaciones';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_repo_list.lng b/interface/web/admin/lib/lang/es_software_repo_list.lng
deleted file mode 100644
index f6a624bd7d93b26e788f1d45d9d61270691a41aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['active_txt'] = 'Habilitado';
-$wb['list_head_txt'] = 'Repositorio';
-$wb['repo_name_txt'] = 'Repositorio';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_update_list.lng b/interface/web/admin/lib/lang/es_software_update_list.lng
deleted file mode 100644
index 827c60e2999d9449e066a37dc09d1e0998ca7111..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['action_txt'] = 'Acción';
-$wb['installed_txt'] = 'Acción';
-$wb['list_head_txt'] = 'Actualizaciones de aplicaciones';
-$wb['no_updates_txt'] = 'No hay actualizaciones';
-$wb['server_select_txt'] = 'Seleccionar servidor';
-$wb['update_title_txt'] = 'Actualizar';
-$wb['version_txt'] = 'Versión';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package.lng b/interface/web/admin/lib/lang/fi_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package_install.lng b/interface/web/admin/lib/lang/fi_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
deleted file mode 100644
index 87a9e193b5af46ab72dd14323f5d181e74e9907a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapaketit';
-$wb['installed_txt'] = 'Ohjelmapaketin tila';
-$wb['package_title_txt'] = 'Ohjelmapaketti';
-$wb['package_description_txt'] = 'Ohjelmapaketin kuvaus';
-$wb['action_txt'] = 'Toiminto';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_repo.lng b/interface/web/admin/lib/lang/fi_software_repo.lng
deleted file mode 100644
index f875f428b61f390155ef162d7e27f404328627b2..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
-$wb['repo_url_txt'] = 'Varaston internetosoite';
-$wb['repo_username_txt'] = 'Käyttäjätunnus (valinnainen)';
-$wb['repo_password_txt'] = 'Salasana (valinnnainen)';
-$wb['active_txt'] = 'Käytössä';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_repo_list.lng b/interface/web/admin/lib/lang/fi_software_repo_list.lng
deleted file mode 100644
index bde844c99f8d8ea61c5e7b4b1dd98c831ae57a92..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapakettien varastot';
-$wb['active_txt'] = 'Käytössä';
-$wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
-$wb['repo_url_txt'] = 'Ohjelmapakettien varaston osoite';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
deleted file mode 100644
index 7871958353e51a7265e5910c7273e825a04ddb76..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapäivitykset';
-$wb['installed_txt'] = 'Toiminto';
-$wb['update_title_txt'] = 'Päivitä';
-$wb['version_txt'] = 'Versio';
-$wb['action_txt'] = 'Toiminto';
-$wb['server_select_txt'] = 'Valitse palvelin';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package.lng b/interface/web/admin/lib/lang/fr_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package_install.lng b/interface/web/admin/lib/lang/fr_software_package_install.lng
deleted file mode 100644
index 39f643d3e65cc933abfe042042a4b4c333629590..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installer un paquet logiciel';
-$wb['install_key_txt'] = 'Entrez la clef dinstallation';
-$wb['btn_save_txt'] = 'Démarrer linstallation';
-$wb['btn_cancel_txt'] = 'Annuler';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng
deleted file mode 100644
index 405b9e296fb191f3b337bf4f54ee0a8213748d4a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Paquets de logiciels';
-$wb['installed_txt'] = 'Statut';
-$wb['package_title_txt'] = 'Paquet';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Mettre à jour la liste des paquets';
-$wb['package_id_txt'] = 'App-ID locale';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_repo.lng b/interface/web/admin/lib/lang/fr_software_repo.lng
deleted file mode 100644
index f65c955d52d18927304af8fd78f1148091496408..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Référence';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utilisateur (optionnel)';
-$wb['repo_password_txt'] = 'Mot de passe (optionnel)';
-$wb['active_txt'] = 'Actif';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_repo_list.lng b/interface/web/admin/lib/lang/fr_software_repo_list.lng
deleted file mode 100644
index 56749896bb0bf5c6b876cc1646a07ee273380656..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Référence';
-$wb['active_txt'] = 'Actif';
-$wb['repo_name_txt'] = 'Référence';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_update_list.lng b/interface/web/admin/lib/lang/fr_software_update_list.lng
deleted file mode 100644
index 8fb67a03104596fa99c9e79560ccab14b00f50cb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Mise à jour des logiciels';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Mise à jour';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['server_select_txt'] = 'Sélectionnez le serveur';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package.lng b/interface/web/admin/lib/lang/hr_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package_install.lng b/interface/web/admin/lib/lang/hr_software_package_install.lng
deleted file mode 100644
index 22d7e0ce7a68bb864877ecaa7274034f9dc970bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instaliraj softverski paket';
-$wb['install_key_txt'] = 'Unesi instalacijski ključ';
-$wb['btn_save_txt'] = 'Pokreni instalaciju';
-$wb['btn_cancel_txt'] = 'Odustani';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng
deleted file mode 100644
index 3722c5cff47ab2f4fc138fe036a087aa8226de13..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aplikacije i dodatni paketi';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paketi';
-$wb['package_description_txt'] = 'Opis';
-$wb['action_txt'] = 'Akcija';
-$wb['toolsarea_head_txt'] = 'Paketi';
-$wb['repoupdate_txt'] = 'Osvježi listu paketa';
-$wb['package_id_txt'] = 'lokalni App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng
deleted file mode 100644
index bbfb2e2db29084c137cfd29804fc6be4ea2960ca..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repozitoriji';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Korisničko ime (opcionalno)';
-$wb['repo_password_txt'] = 'Å ifra (opcionalno)';
-$wb['active_txt'] = 'Aktivno';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_repo_list.lng b/interface/web/admin/lib/lang/hr_software_repo_list.lng
deleted file mode 100644
index b79045bd76e8c2bdd363617f56efde702ebf5c92..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repozitorij';
-$wb['active_txt'] = 'Aktivno';
-$wb['repo_name_txt'] = 'Repozitorij';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng
deleted file mode 100644
index 2250a186a33ca4e7cfa2f2882b9100047aed4a9b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softverske nadogradnje';
-$wb['server_select_txt'] = 'Izaberi server';
-$wb['installed_txt'] = 'Akcija';
-$wb['update_title_txt'] = 'Nadogradi';
-$wb['version_txt'] = 'Verzija';
-$wb['action_txt'] = 'Akcija';
-$wb['no_updates_txt'] = 'Nema nadogradnji';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package.lng b/interface/web/admin/lib/lang/hu_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package_install.lng b/interface/web/admin/lib/lang/hu_software_package_install.lng
deleted file mode 100644
index 6dc8be3f899c18a4a3796440fccbd743a203d51e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Szoftvercsomag telepítése';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Mégsem';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng
deleted file mode 100644
index 430583ce8a807b7741947c3a561baa6ef165b74d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Szoftver csomag';
-$wb['installed_txt'] = 'Állapot';
-$wb['package_title_txt'] = 'Csomag';
-$wb['package_description_txt'] = 'Leírás';
-$wb['action_txt'] = 'Művelet';
-$wb['toolsarea_head_txt'] = 'Csomagok';
-$wb['repoupdate_txt'] = 'Csomaglista frissítése';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_repo.lng b/interface/web/admin/lib/lang/hu_software_repo.lng
deleted file mode 100644
index 3c578e3694e64e0bb61e2042a7af189fbb633b8b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'Cím';
-$wb['repo_username_txt'] = 'Felhasználó (opcionális)';
-$wb['repo_password_txt'] = 'Jelszó (opcionális)';
-$wb['active_txt'] = 'Aktív';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_repo_list.lng b/interface/web/admin/lib/lang/hu_software_repo_list.lng
deleted file mode 100644
index f5e7aabcb2dd935dc28ee9649aa2e33e85356a04..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Aktív';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'Cím';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_update_list.lng b/interface/web/admin/lib/lang/hu_software_update_list.lng
deleted file mode 100644
index c2edc83217d879d6cfc829de25c24afb3a1964ef..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Szoftver frissítések';
-$wb['installed_txt'] = 'Művelet';
-$wb['update_title_txt'] = 'Frissítés';
-$wb['version_txt'] = 'Verzió';
-$wb['action_txt'] = 'Művelet';
-$wb['server_select_txt'] = 'Válasszon szervert';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package.lng b/interface/web/admin/lib/lang/id_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package_install.lng b/interface/web/admin/lib/lang/id_software_package_install.lng
deleted file mode 100644
index 9e966893caefed15e144571afc07f91705df52ea..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Pasang paket perangkat lunak';
-$wb['install_key_txt'] = 'Masukkan kunci pemasangan';
-$wb['btn_save_txt'] = 'Mulai Pemasangan';
-$wb['btn_cancel_txt'] = 'Batal';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package_list.lng b/interface/web/admin/lib/lang/id_software_package_list.lng
deleted file mode 100644
index 02642be6e2c75183a8a08800207bf82f36424fb5..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Paket-paket Perangkat Lunak';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Keterangan';
-$wb['action_txt'] = 'Aktif';
-$wb['toolsarea_head_txt'] = 'Paket';
-$wb['repoupdate_txt'] = 'Mutakhirkan daftar paket';
-$wb['package_id_txt'] = 'App-ID lokal';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_repo.lng b/interface/web/admin/lib/lang/id_software_repo.lng
deleted file mode 100644
index 1c3b0305b4f25e5b09952507b4eb9c200dbc71bd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositori';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Pengguna (opsional)';
-$wb['repo_password_txt'] = 'Sandi (opsional)';
-$wb['active_txt'] = 'Aktif';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_repo_list.lng b/interface/web/admin/lib/lang/id_software_repo_list.lng
deleted file mode 100644
index 63444907f31569d6926313329d15939bf2b9979c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositori';
-$wb['active_txt'] = 'Aktif';
-$wb['repo_name_txt'] = 'Repositori';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_update_list.lng b/interface/web/admin/lib/lang/id_software_update_list.lng
deleted file mode 100644
index f789a0e72c472d55b27e254771c57d98bfcae3fd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pemutakhiran Perangkat Lunak';
-$wb['server_select_txt'] = 'Pilih server';
-$wb['installed_txt'] = 'Tindakan';
-$wb['update_title_txt'] = 'Mutakhirkan';
-$wb['version_txt'] = 'Versi';
-$wb['action_txt'] = 'Tindakan';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package.lng b/interface/web/admin/lib/lang/it_software_package.lng
deleted file mode 100644
index d2e123cf85abc3c9fce3de2d5b6f3d5fa3c85459..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Titolo pacchetto';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Pacchetto Software';
-$wb['Modify software package details'] = 'Modifica dettagli pacchetto software';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package_install.lng b/interface/web/admin/lib/lang/it_software_package_install.lng
deleted file mode 100644
index 1e210d58940cd0a352afaf9ff1d0f81697b8540e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installa pacchetto software';
-$wb['install_key_txt'] = 'Inserisci chiave pacchetto';
-$wb['btn_save_txt'] = 'Avvia installazione';
-$wb['btn_cancel_txt'] = 'Annulla';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng
deleted file mode 100644
index 5ab82417de404318600984e7ac4d732fcb130840..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacchetti Software';
-$wb['installed_txt'] = 'Stato';
-$wb['package_title_txt'] = 'Pacchetto';
-$wb['package_description_txt'] = 'Descrizione';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Pacchetti';
-$wb['repoupdate_txt'] = 'Aggiorna elenco pacchetti';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'Nessun pacchetto disponibile';
-$wb['edit_txt'] = 'Modifica';
-$wb['delete_txt'] = 'Elimina';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_repo.lng b/interface/web/admin/lib/lang/it_software_repo.lng
deleted file mode 100644
index 76b01826971d75f28c53c52dbbed40f3587a7fdd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utente (facoltativo)';
-$wb['repo_password_txt'] = 'Password (facoltativa)';
-$wb['active_txt'] = 'Attivo';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository che può contenere aggiunte o aggiornamenti';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_repo_list.lng b/interface/web/admin/lib/lang/it_software_repo_list.lng
deleted file mode 100644
index 4db52118ec6bd564032ac437355c68aa5e17cf78..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Attivo';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'Indirizzo';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
deleted file mode 100644
index cc264b84eccbc926ccc68ca4b553548ad9eaf764..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aggiornamento programmi';
-$wb['installed_txt'] = 'Azione';
-$wb['update_title_txt'] = 'Aggiornamento';
-$wb['version_txt'] = 'Versione';
-$wb['action_txt'] = 'Azione';
-$wb['server_select_txt'] = 'Selezionare server';
-$wb['no_updates_txt'] = 'Nessun aggiornamento disponibile';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package.lng b/interface/web/admin/lib/lang/ja_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_install.lng b/interface/web/admin/lib/lang/ja_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_list.lng b/interface/web/admin/lib/lang/ja_software_package_list.lng
deleted file mode 100644
index e5352e91e7cf91fe7472f0797853dc7d9b77c1d9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ソフトウェアパッケージ';
-$wb['installed_txt'] = '状態';
-$wb['package_title_txt'] = 'パッケージ';
-$wb['package_description_txt'] = '説明';
-$wb['action_txt'] = '操作';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_repo.lng b/interface/web/admin/lib/lang/ja_software_repo.lng
deleted file mode 100644
index c95399a54ebba86be6c0d10e24e1bdecb0f737cb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'リポジトリー';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'ユーザー（必要があれば）';
-$wb['repo_password_txt'] = 'パスワード（必要があれば）';
-$wb['active_txt'] = '有効';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_repo_list.lng b/interface/web/admin/lib/lang/ja_software_repo_list.lng
deleted file mode 100644
index a7d06d8fdec5616b64fbd9e572d0d37b11b0a337..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'リポジトリー';
-$wb['active_txt'] = '有効';
-$wb['repo_name_txt'] = 'リポジトリー';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_update_list.lng b/interface/web/admin/lib/lang/ja_software_update_list.lng
deleted file mode 100644
index f0ecf5711bfbe603072a559a54073ea008303770..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ソフトウェアの更新';
-$wb['server_select_txt'] = 'サーバーを選択してください';
-$wb['installed_txt'] = '操作';
-$wb['update_title_txt'] = 'æ›´æ–°';
-$wb['version_txt'] = 'バージョン';
-$wb['action_txt'] = '操作';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package.lng b/interface/web/admin/lib/lang/nl_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package_install.lng b/interface/web/admin/lib/lang/nl_software_package_install.lng
deleted file mode 100644
index 87150b8cf190777da50b76bb1c1010aa108009c0..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install softwarepakket';
-$wb['install_key_txt'] = 'Voer installatie sleutel in';
-$wb['btn_save_txt'] = 'Start installatie';
-$wb['btn_cancel_txt'] = 'Annuleren';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng
deleted file mode 100644
index 44aaa563ad06f472796aa96a31d9a241c9cee4fc..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon pakketten';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakket';
-$wb['package_description_txt'] = 'Omschrijving';
-$wb['action_txt'] = 'Actie';
-$wb['toolsarea_head_txt'] = 'Pakketten';
-$wb['repoupdate_txt'] = 'Update pakketlijst';
-$wb['package_id_txt'] = 'lokaal App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng
deleted file mode 100644
index 665c4197a24af7dd5caa4cc89e2e599f4a9a953e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optionieel)';
-$wb['repo_password_txt'] = 'Password (optionieel)';
-$wb['active_txt'] = 'Actief';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_repo_list.lng b/interface/web/admin/lib/lang/nl_software_repo_list.lng
deleted file mode 100644
index fc05fc269b9d6bdf36e7d0fb2d2f4f25822e33aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Actief';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng
deleted file mode 100644
index 0d05c855943aad9b9933f72c91130efe5d17622f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Selecteer server';
-$wb['installed_txt'] = 'Actie';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Versie';
-$wb['action_txt'] = 'Actie';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package.lng b/interface/web/admin/lib/lang/pl_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
deleted file mode 100644
index fd2f2930dde345143a239e3755d6c6e0bfe32470..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalacja pakietu oprogramowania';
-$wb['install_key_txt'] = 'Podaj klucz instalacyjny';
-$wb['btn_save_txt'] = 'Start instalacji';
-$wb['btn_cancel_txt'] = 'Przerwij';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
deleted file mode 100644
index cb47abc46d380b691323486a72343a62f531b3ce..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pakiety z oprogramowaniem';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakiet';
-$wb['package_description_txt'] = 'Opis';
-$wb['action_txt'] = 'Akcja';
-$wb['toolsarea_head_txt'] = 'Pakiety';
-$wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
-$wb['package_id_txt'] = 'lokalny App-ID';
-$wb['no_packages_txt'] = 'Brak dostępnych pakietów';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
deleted file mode 100644
index 1cc3dbb61c0846e040754b5462bb40ccf7cad308..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repozytorium';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
-$wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
-$wb['active_txt'] = 'Aktywny';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
deleted file mode 100644
index 7ca6af9f9f43559891103a0c50ebd189da3f795b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repozytoria';
-$wb['active_txt'] = 'Aktywny';
-$wb['repo_name_txt'] = 'Repozytoria';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
deleted file mode 100644
index aa49fba4e72ce46c22c3ca7a2d0a23ee6728a8f9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aktualizacje oprogramowania';
-$wb['server_select_txt'] = 'Wybierz serwer';
-$wb['installed_txt'] = 'Akcja';
-$wb['update_title_txt'] = 'Aktualizacja';
-$wb['version_txt'] = 'Wersja';
-$wb['action_txt'] = 'Akcja';
-$wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package.lng b/interface/web/admin/lib/lang/pt_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package_install.lng b/interface/web/admin/lib/lang/pt_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package_list.lng b/interface/web/admin/lib/lang/pt_software_package_list.lng
deleted file mode 100644
index 1ec77bdd15f5403cd7bae71e328b56c5666f21ae..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacotes de Software';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pacote';
-$wb['package_description_txt'] = 'Descrição';
-$wb['action_txt'] = 'Acção';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_repo.lng b/interface/web/admin/lib/lang/pt_software_repo.lng
deleted file mode 100644
index 436758e6871176d63b44f4eb812ebe2b945dc187..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utilizador (opcional)';
-$wb['repo_password_txt'] = 'Senha (opcional)';
-$wb['active_txt'] = 'Activo';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_repo_list.lng b/interface/web/admin/lib/lang/pt_software_repo_list.lng
deleted file mode 100644
index 5afba6d5e354b883e14193e3b1e45af361fbd135..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositório';
-$wb['active_txt'] = 'Activo';
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_update_list.lng b/interface/web/admin/lib/lang/pt_software_update_list.lng
deleted file mode 100644
index 12fd9e2fa9106e1b1e6087fe06fc4dc641b1f71e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Actualizações de Programas';
-$wb['server_select_txt'] = 'Seleccione o servidor';
-$wb['installed_txt'] = 'Acções';
-$wb['update_title_txt'] = 'Actualizar';
-$wb['version_txt'] = 'Versão';
-$wb['action_txt'] = 'Acção';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package.lng b/interface/web/admin/lib/lang/ro_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package_install.lng b/interface/web/admin/lib/lang/ro_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package_list.lng b/interface/web/admin/lib/lang/ro_software_package_list.lng
deleted file mode 100644
index 4a8dcbcbf09d1141554f5f73e6a0cea790911448..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pachete Software ';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pachet';
-$wb['package_description_txt'] = 'Descriere';
-$wb['action_txt'] = 'Actiune';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_repo.lng b/interface/web/admin/lib/lang/ro_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_repo_list.lng b/interface/web/admin/lib/lang/ro_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_update_list.lng b/interface/web/admin/lib/lang/ro_software_update_list.lng
deleted file mode 100644
index 1e85d6de5f373ca10133099e354f59a3debe33f1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software update';
-$wb['server_select_txt'] = 'Selectie server';
-$wb['installed_txt'] = 'Actiune';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Versiune';
-$wb['action_txt'] = 'Actiune';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package.lng b/interface/web/admin/lib/lang/ru_software_package.lng
deleted file mode 100644
index 490184dd9273e48d69c9cecfdd313c95684a75f3..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Название пакета';
-$wb['package_key_txt'] = 'Ключ пакета';
-$wb['Software Package'] = 'Пакет ПО';
-$wb['Modify software package details'] = 'Изменить детали пакета программного обеспечения';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package_install.lng b/interface/web/admin/lib/lang/ru_software_package_install.lng
deleted file mode 100644
index 21efc7d5629d6f3eb9f561786eff2858d8afd2c8..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Установить пакет ПО';
-$wb['install_key_txt'] = 'Ввод ключа установки';
-$wb['btn_save_txt'] = 'Начать установку';
-$wb['btn_cancel_txt'] = 'Отменить';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng
deleted file mode 100644
index 791cfa33aed4e3141df8a82bf1c4a0f6d9dbb27f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Пакеты ПО';
-$wb['installed_txt'] = 'Статус';
-$wb['package_title_txt'] = 'Пакет';
-$wb['package_description_txt'] = 'Описание';
-$wb['action_txt'] = 'Действие';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Обновить сисок пакетов';
-$wb['package_id_txt'] = 'Локальный App-ID';
-$wb['no_packages_txt'] = 'Нет доступных пакетов';
-$wb['edit_txt'] = 'Изменить';
-$wb['delete_txt'] = 'Удалить';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_repo.lng b/interface/web/admin/lib/lang/ru_software_repo.lng
deleted file mode 100644
index 5aec8763c173d4ac73419c725857b0978e1b8743..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Репозиторий';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Логин (опционально)';
-$wb['repo_password_txt'] = 'Пароль (опционально)';
-$wb['active_txt'] = 'Активен?';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_repo_list.lng b/interface/web/admin/lib/lang/ru_software_repo_list.lng
deleted file mode 100644
index ed307454aef1042f662726326029eb9ed541340f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Репозитории';
-$wb['active_txt'] = 'Активно';
-$wb['repo_name_txt'] = 'Репозиторий';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_update_list.lng b/interface/web/admin/lib/lang/ru_software_update_list.lng
deleted file mode 100644
index dde28811d537a8d95b07736564cae1f6d81659cd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Обновление ПО';
-$wb['installed_txt'] = 'Действие';
-$wb['update_title_txt'] = 'Обновить';
-$wb['version_txt'] = 'Версия';
-$wb['action_txt'] = 'Действие';
-$wb['server_select_txt'] = 'Выберите сервер';
-$wb['no_updates_txt'] = 'Нет доступных обновлений';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package.lng b/interface/web/admin/lib/lang/se_software_package.lng
deleted file mode 100644
index 086902db0cbddab5c57150f462e0583e020903a6..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Pakettitel';
-$wb['package_key_txt'] = 'Packetnyckel';
-$wb['Software Package'] = 'Mjukvarupaket';
-$wb['Modify software package details'] = 'Redigera mjukvarupaketets uppgifter';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package_install.lng b/interface/web/admin/lib/lang/se_software_package_install.lng
deleted file mode 100644
index 434fc4bc98139ec1e01a513bd4cd8036e446edb7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installera mjukvarupaket';
-$wb['install_key_txt'] = 'Fyll i installationsnyckel';
-$wb['btn_save_txt'] = 'Påbörja installation';
-$wb['btn_cancel_txt'] = 'Avbryt';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng
deleted file mode 100644
index c0222e1ba4fb975e56722d0080afde3d734e0cfb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Mjukvarupaket';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Beskrivning';
-$wb['action_txt'] = 'Händelse';
-$wb['toolsarea_head_txt'] = 'Paket';
-$wb['repoupdate_txt'] = 'Uppdatera paketlista';
-$wb['package_id_txt'] = 'lokalt App-ID';
-$wb['no_packages_txt'] = 'Inga paket tillgängliga';
-$wb['edit_txt'] = 'Redigera';
-$wb['delete_txt'] = 'Radera';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_repo.lng b/interface/web/admin/lib/lang/se_software_repo.lng
deleted file mode 100644
index a0e0de6822419055beee042cb8df66b7532d9984..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Bibliotek';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Användare (Frivilligt)';
-$wb['repo_password_txt'] = 'Lösenord (Frivilligt)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Pragarmvarubibliotek som kan innehålla uppdateringar eller tillägg';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_repo_list.lng b/interface/web/admin/lib/lang/se_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_update_list.lng b/interface/web/admin/lib/lang/se_software_update_list.lng
deleted file mode 100644
index 0cf7c0eddc2c9c336c80085af3a5cb98b0f0d806..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Programvaruuppdateringar';
-$wb['installed_txt'] = 'Händelse';
-$wb['update_title_txt'] = 'Uppdatera';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Händelse';
-$wb['server_select_txt'] = 'Välj server';
-$wb['no_updates_txt'] = 'Inga tillgängliga uppdateringar';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package.lng b/interface/web/admin/lib/lang/sk_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package_install.lng b/interface/web/admin/lib/lang/sk_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package_list.lng b/interface/web/admin/lib/lang/sk_software_package_list.lng
deleted file mode 100644
index 502a3a2237707e5c196a6b6523743c118fb02870..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softvérové balíky';
-$wb['installed_txt'] = 'Stav';
-$wb['package_title_txt'] = 'Balíky';
-$wb['package_description_txt'] = 'Popis';
-$wb['action_txt'] = 'Akcia';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_repo.lng b/interface/web/admin/lib/lang/sk_software_repo.lng
deleted file mode 100644
index 263614f50c2b62177cdaf21eb27de6d42b6adc64..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Skladisko';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživateľ (voliteľný)';
-$wb['repo_password_txt'] = 'Heslo (voliteľné)';
-$wb['active_txt'] = 'Aktivovať';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_repo_list.lng b/interface/web/admin/lib/lang/sk_software_repo_list.lng
deleted file mode 100644
index c77d4a3846eb7cbcdd5aa639f7c63e96aba501ee..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Skladisko';
-$wb['active_txt'] = 'Aktívne';
-$wb['repo_name_txt'] = 'Skladisko';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_update_list.lng b/interface/web/admin/lib/lang/sk_software_update_list.lng
deleted file mode 100644
index 9a04707c3ed2dc48e79ece8016eab73babe8f86e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aktualizácia softvéru';
-$wb['server_select_txt'] = 'Vyberte server';
-$wb['installed_txt'] = 'Akcia';
-$wb['update_title_txt'] = 'Aktualizácia ';
-$wb['version_txt'] = 'Verzia';
-$wb['action_txt'] = 'Akcia';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package.lng b/interface/web/admin/lib/lang/tr_software_package.lng
deleted file mode 100644
index addda60195a1bb25f115b50b835b59153eea8030..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Paket Başlığı';
-$wb['package_key_txt'] = 'Paket Anahtarı';
-$wb['Software Package'] = 'Yazılım Paketi';
-$wb['Modify software package details'] = 'Yazılım paketi bilgilerini düzenle';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package_install.lng b/interface/web/admin/lib/lang/tr_software_package_install.lng
deleted file mode 100644
index fe7dd26e735ac376fc846b932c0cc806d9347eed..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Yazılım Paketi Yükleme';
-$wb['install_key_txt'] = 'Yükleme anahtarını yazın';
-$wb['btn_save_txt'] = 'Yüklemeyi Başlat';
-$wb['btn_cancel_txt'] = 'Geri';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng
deleted file mode 100644
index 1838ff94cfc3b7f0e87cfd68f1bb25da551f4988..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Yazılım Paketleri';
-$wb['installed_txt'] = 'Durum';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Açıklama';
-$wb['action_txt'] = 'Ä°ÅŸlem';
-$wb['toolsarea_head_txt'] = 'Paketler';
-$wb['repoupdate_txt'] = 'Paket Listesini Güncelle';
-$wb['package_id_txt'] = 'yerel uygulama kodu';
-$wb['no_packages_txt'] = 'Henüz kullanılabilecek bir paket yok';
-$wb['edit_txt'] = 'Düzenle';
-$wb['delete_txt'] = 'Sil';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_repo.lng b/interface/web/admin/lib/lang/tr_software_repo.lng
deleted file mode 100644
index 13e113967fad2f6fe9ef10ee1d190abc9ab7fd23..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Depo';
-$wb['repo_url_txt'] = 'Ä°nternet Adresi';
-$wb['repo_username_txt'] = 'Kullanıcı Adı (isteğe bağlı)';
-$wb['repo_password_txt'] = 'Parola (isteğe bağlı)';
-$wb['active_txt'] = 'Etkin';
-$wb['Software Repository which may contain addons or updates'] = 'Eklenti ya da güncellemeleri içeren yazılım deposu';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_repo_list.lng b/interface/web/admin/lib/lang/tr_software_repo_list.lng
deleted file mode 100644
index 5e2fdf5b928950f51e2da6d597739afef36d1d11..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Depolar';
-$wb['active_txt'] = 'Etkin';
-$wb['repo_name_txt'] = 'Depo';
-$wb['repo_url_txt'] = 'Ä°nternet Adresi';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_update_list.lng b/interface/web/admin/lib/lang/tr_software_update_list.lng
deleted file mode 100644
index a462d90faa7dc79180330f9ebe69d176cdc5117d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Yazılım Güncellemeleri';
-$wb['server_select_txt'] = 'Sunucu Seçin';
-$wb['installed_txt'] = 'Ä°ÅŸlem';
-$wb['update_title_txt'] = 'Güncelleme';
-$wb['version_txt'] = 'Sürüm';
-$wb['action_txt'] = 'Ä°ÅŸlem';
-$wb['no_updates_txt'] = 'Henüz bir güncelleme yok';
-?>
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 124656b7f302df41d02cd388e21354f7d9688fbb..59b2e1ffc170909c060f93a4db265f965e04a3e5 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -92,30 +92,6 @@ $module['nav'][] = array(   'title'     => 'Interface',
 	'items'     => $items);
 
 
-// cleanup
-unset($items);
-
-
-$items[] = array(   'title'  => 'Repositories',
-	'target'  => 'content',
-	'link' => 'admin/software_repo_list.php',
-	'html_id'   => 'software_repo_list');
-
-$items[] = array(   'title'  => 'Packages',
-	'target'  => 'content',
-	'link' => 'admin/software_package_list.php',
-	'html_id'   => 'software_package_list');
-
-$items[] = array(   'title'  => 'Updates',
-	'target'  => 'content',
-	'link' => 'admin/software_update_list.php',
-	'html_id'   => 'software_update_list');
-
-$module['nav'][] = array(   'title'     => 'Software',
-	'open'  => 1,
-	'items' => $items);
-
-
 // cleanup
 unset($items);
 
diff --git a/interface/web/admin/list/software_repo.list.php b/interface/web/admin/list/software_repo.list.php
deleted file mode 100644
index 0e172ace99ad7bf2bf53234922d2aa7432a90fb3..0000000000000000000000000000000000000000
--- a/interface/web/admin/list/software_repo.list.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
-	Datatypes:
-	- INTEGER
-	- DOUBLE
-	- CURRENCY
-	- VARCHAR
-	- TEXT
-	- DATE
-*/
-
-
-
-// Name of the list
-$liste["name"]     = "software_repo";
-
-// Database table
-$liste["table"]    = "software_repo";
-
-// Index index field of the database table
-$liste["table_idx"]   = "software_repo_id";
-
-// Search Field Prefix
-$liste["search_prefix"]  = "search_";
-
-// Records per page
-$liste["records_per_page"]  = "15";
-
-// Script File of the list
-$liste["file"]    = "software_repo_list.php";
-
-// Script file of the edit form
-$liste["edit_file"]   = "software_repo_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"]  = "software_repo_del.php";
-
-// Paging Template
-$liste["paging_tpl"]  = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"]    = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-$liste["item"][] = array( 'field'  => "active",
-	'datatype' => "VARCHAR",
-	'formtype' => "SELECT",
-	'op'  => "=",
-	'prefix' => "",
-	'suffix' => "",
-	'width'  => "",
-	'value'  => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt')));
-
-$liste["item"][] = array( 'field'  => "repo_name",
-	'datatype' => "VARCHAR",
-	'formtype' => "TEXT",
-	'op'  => "like",
-	'prefix' => "%",
-	'suffix' => "%",
-	'width'  => "",
-	'value'  => "");
-
-
-$liste["item"][] = array( 'field'  => "repo_url",
-	'datatype' => "VARCHAR",
-	'formtype' => "TEXT",
-	'op'  => "like",
-	'prefix' => "%",
-	'suffix' => "%",
-	'width'  => "",
-	'value'  => "");
-
-?>
diff --git a/interface/web/admin/software_package_del.php b/interface/web/admin/software_package_del.php
deleted file mode 100644
index e1387f39c43459b7261f1d90d19798a78c4a7d3e..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_del.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2012, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Check CSRF Token
-$app->auth->csrf_token_check('GET');
-
-$software_update_inst_id = $app->functions->intval($_GET['software_update_inst_id']);
-
-if($software_update_inst_id > 0) {
-	$app->db->datalogDelete('software_update_inst', 'software_update_inst_id', $software_update_inst_id);
-	//header('Location: admin/software_package_list.php');
-	die('HEADER_REDIRECT: admin/software_package_list.php');
-} else {
-	die('Invalid ID');
-}
-
-
-
-
-
-
-?>
diff --git a/interface/web/admin/software_package_edit.php b/interface/web/admin/software_package_edit.php
deleted file mode 100644
index 65555d3a3570d12fce552171a1df350201902c75..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_edit.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/software_package.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php
deleted file mode 100644
index 6a5326d51a1bed56d1d1b2faf862d8aa38533f3d..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_install.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2010, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-// Check CSRF Token
-if(count($_POST) > 0) {
-	$app->auth->csrf_token_check('POST');
-} else {
-	$app->auth->csrf_token_check('GET');
-}
-
-$package_name = $_REQUEST['package'];
-$install_server_id = $app->functions->intval($_REQUEST['server_id']);
-$install_key = trim($_REQUEST['install_key']);
-
-$package = $app->db->queryOneRecord("SELECT * FROM software_package WHERE package_name = ?", $package_name);
-
-$install_key_verified = false;
-$message_err = '';
-$message_ok = '';
-
-//* verify the key
-if($package['package_installable'] == 'key' && $install_key != '') {
-
-	$repo = $app->db->queryOneRecord("SELECT * FROM software_repo WHERE software_repo_id = ?", $package['software_repo_id']);
-
-	$client = new SoapClient(null, array('location' => $repo['repo_url'],
-			'uri'      => $repo['repo_url']));
-
-	$install_key_verified = $client->check_installable($package_name, $install_key, $repo['repo_username'], $repo['repo_password']);
-
-	if($install_key_verified == false) {
-		//$install_key = '';
-		$message_err = 'Verification of the key failed.';
-	} else {
-		// Store the verified key into the database
-		$app->db->datalogUpdate('software_package', array("package_key" => $install_key), 'package_id', $package['package_id']);
-	}
-} else {
-	$message_ok = 'Please enter the software key for the package.';
-}
-
-//* Install packages, if all requirements are fullfilled.
-if($install_server_id > 0 && $package_name != '' && ($package['package_installable'] == 'yes' || $install_key_verified == true)) {
-	$sql = "SELECT software_update_id, package_name, update_title FROM software_update WHERE type = 'full' AND package_name = ? ORDER BY v1 DESC, v2 DESC, v3 DESC, v4 DESC LIMIT 0,1";
-	$tmp = $app->db->queryOneRecord($sql, $package_name);
-	$software_update_id = $tmp['software_update_id'];
-
-	//* if package requires a DB and there is no data for a db in config, then we create this data now
-	if($package['package_requires_db'] == 'mysql') {
-		$app->uses('ini_parser,getconf');
-
-		$package_config_array = array();
-		if(trim($package['package_config']) != '') {
-			$package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config']));
-		}
-
-		if(!isset($package_config_array['mysql'])) {
-			$package_config_array['mysql'] = array( 'database_name' => 'ispapp'.$package['package_id'],
-				'database_user' => 'ispapp'.$package['package_id'],
-				'database_password' => md5(mt_rand()),
-				'database_host' => 'localhost');
-			$package_config_str = $app->ini_parser->get_ini_string($package_config_array);
-			$package['package_config'] = $package_config_str;
-			$app->db->datalogUpdate('software_package', array("package_config" => $package_config_str), 'package_id', $package['package_id']);
-		}
-	}
-
-	//* If the packages requires a remote user
-	if($package['package_remote_functions'] != '') {
-
-		if(trim($package['package_config']) != '') {
-			$package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config']));
-		}
-
-		if(!isset($package_config_array['remote_api'])) {
-			$remote_user = 'ispapp'.$package['package_id'];
-			$remote_password = md5(mt_rand());
-			$remote_functions = $package['package_remote_functions'];
-
-			$package_config_array['remote_api'] = array(
-				'remote_hostname' => $_SERVER['HTTP_HOST'],
-				'remote_user'   => $remote_user,
-				'remote_password'  => $remote_password
-			);
-
-			$package_config_str = $app->ini_parser->get_ini_string($package_config_array);
-			$package['package_config'] = $package_config_str;
-			$remote_password_md5 = md5($remote_password);
-			$app->db->datalogUpdate('software_package', array("package_config" => $package_config_str), 'package_id', $package['package_id']);
-
-			$sql = "INSERT INTO `remote_user` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `remote_username`, `remote_password`, `remote_functions`) VALUES
-					(1, 1, 'riud', 'riud', '', ?, ?, ?)";
-			$app->db->query($sql, $remote_user, $remote_password_md5, $remote_functions);
-
-		}
-
-	}
-
-	//* Add the record to start the install process
-	$insert_data = array(
-		"package_name" => $package_name,
-		"server_id" => $install_server_id,
-		"software_update_id" => $software_update_id,
-		"status" => 'installing'
-	);
-	$app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
-	$message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"ISPConfig.submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
-
-}
-
-if(count($_POST) > 2 && $install_key == '') {
-	$message_ok = 'Please enter the software key.';
-}
-
-//* Show key input form
-if($package['package_installable'] == 'key' && !$install_key_verified) {
-	$insert_key = true;
-} else {
-	$insert_key = false;
-}
-
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_package_install.htm');
-
-$app->tpl->setVar('message_ok', $message_ok);
-$app->tpl->setVar('message_err', $message_err);
-$app->tpl->setVar('insert_key', $insert_key);
-$app->tpl->setVar('install_key', $install_key);
-$app->tpl->setVar('package_name', $package_name);
-$app->tpl->setVar('server_id', $install_server_id);
-
-
-include_once 'lib/lang/en_software_package_install.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-?>
diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php
deleted file mode 100644
index 8a21696c7f398600ba7083b3f95d3e8f548de825..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_list.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-//* Get the latest packages from the repositorys and insert them in the local database
-$packages_added = 0;
-$repos = $app->db->queryAllRecords("SELECT software_repo_id, repo_url, repo_username, repo_password FROM software_repo WHERE active = 'y'");
-if(is_array($repos) && isset($_GET['action']) && $_GET['action'] == 'repoupdate' ) {
-	foreach($repos as $repo) {
-		$client = new SoapClient(null, array('location' => $repo['repo_url'],
-				'uri'      => $repo['repo_url']));
-
-		$packages = $client->get_packages($repo['repo_username'], $repo['repo_password']);
-		if(is_array($packages)) {
-			foreach($packages as $p) {
-				$package_name = $p['name'];
-				$tmp = $app->db->queryOneRecord("SELECT package_id FROM software_package WHERE package_name = ?", $package_name);
-
-				$package_title = $p['title'];
-				$package_description = $p['description'];
-				$software_repo_id = $app->functions->intval($repo['software_repo_id']);
-				$package_type = $p['type'];
-				$package_installable = $p['installable'];
-				$package_requires_db = $p['requires_db'];
-				$package_remote_functions = $p['remote_functions'];
-
-				if(empty($tmp['package_id'])) {
-					$insert_data = array(
-						"software_repo_id" => $software_repo_id,
-						"package_name" => $package_name, 
-						"package_title" => $package_title, 
-						"package_description" => $package_description,
-						"package_type" => $package_type,
-						"package_installable" => $package_installable,
-						"package_requires_db" => $package_requires_db,
-						"package_remote_functions" => $package_remote_functions
-						);
-					$app->db->datalogInsert('software_package', $insert_data, 'package_id');
-					$packages_added++;
-				} else {
-					$update_data = array(
-						"software_repo_id" => $software_repo_id,
-						"package_title" => $package_title, 
-						"package_description" => $package_description,
-						"package_type" => $package_type,
-						"package_installable" => $package_installable,
-						"package_requires_db" => $package_requires_db,
-						"package_remote_functions" => $package_remote_functions
-						);
-					//echo $update_data;
-					$app->db->datalogUpdate('software_package', $update_data, 'package_id', $tmp['package_id']);
-				}
-			}
-		}
-
-		$packages = $app->db->queryAllRecords("SELECT software_package.package_name, v1, v2, v3, v4 FROM software_package LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name ) GROUP BY package_name ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC");
-		if(is_array($packages)) {
-			foreach($packages as $p) {
-
-				$version = $p['v1'].'.'.$p['v2'].'.'.$p['v3'].'.'.$p['v4'];
-				$updates = $client->get_updates($p['package_name'], $version, $repo['repo_username'], $repo['repo_password']);
-
-				if(is_array($updates)) {
-					foreach($updates as $u) {
-
-						$version_array = explode('.', $u['version']);
-						$v1 = $app->functions->intval($version_array[0]);
-						$v2 = $app->functions->intval($version_array[1]);
-						$v3 = $app->functions->intval($version_array[2]);
-						$v4 = $app->functions->intval($version_array[3]);
-
-						$package_name = $u['package_name'];
-						$software_repo_id = $app->functions->intval($repo['software_repo_id']);
-						$update_url = $u['url'];
-						$update_md5 = $u['md5'];
-						$update_dependencies = (isset($u['dependencies']))?$u['dependencies']:'';
-						$update_title = $u['title'];
-						$type = $u['type'];
-
-						// Check that we do not have this update in the database yet
-						$sql = "SELECT * FROM software_update WHERE package_name = ? and v1 = ? and v2 = ? and v3 = ? and v4 = ?";
-						$tmp = $app->db->queryOneRecord($sql, $package_name, $v1, $v2, $v3, $v4);
-						if(!isset($tmp['software_update_id'])) {
-							$insert_data = array(
-								"software_repo_id" => $software_repo_id,
-								"package_name" => $package_name,
-								"update_url" => $update_url,
-								"update_md5" => $update_md5,
-								"update_dependencies" => $update_dependencies,
-								"update_title" => $update_title,
-								"v1" => $v1,
-								"v2" => $v2,
-								"v3" => $v3,
-								"v4" => $v4,
-								"type" => $type
-							);
-							$app->db->datalogInsert('software_update', $insert_data, 'software_update_id');
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
-
-// Show the list in the interface
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_package_list.htm');
-
-$csrf_token = $app->auth->csrf_token_get('software_package_list');
-$_csrf_id = $csrf_token['csrf_id'];
-$_csrf_key = $csrf_token['csrf_key'];
-
-$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
-$packages = $app->db->queryAllRecords('SELECT * FROM software_package');
-if(is_array($packages) && count($packages) > 0) {
-	foreach($packages as $key => $p) {
-		$installed_txt = '';
-		foreach($servers as $s) {
-			$inst = $app->db->queryOneRecord("SELECT * FROM software_update, software_update_inst WHERE software_update_inst.software_update_id = software_update.software_update_id AND software_update_inst.package_name = ? AND server_id = ?", $p["package_name"], $s["server_id"]);
-			$version = $inst['v1'].'.'.$inst['v2'].'.'.$inst['v3'].'.'.$inst['v4'];
-
-			if($inst['status'] == 'installed') {
-				$installed_txt .= $s['server_name'].": ".$app->lng("Installed version $version")."<br />";
-			} elseif ($inst['status'] == 'installing') {
-				$installed_txt .= $s['server_name'].": ".$app->lng("Installation in progress")."<br />";
-			} elseif ($inst['status'] == 'failed') {
-				$installed_txt .= $s['server_name'].": ".$app->lng("Installation failed")."<br />";
-			} elseif ($inst['status'] == 'deleting') {
-				$installed_txt .= $s['server_name'].": ".$app->lng("Deletion in progress")."<br />";
-			} else {
-				if($p['package_installable'] == 'no') {
-					$installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
-				} else {
-					$installed_txt .= $s['server_name'].": <a href=\"#\" data-load-content=\"admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."&_csrf_key=".$_csrf_key."&_csrf_id=".$_csrf_id."\">Install now</a><br />";
-				}
-			}
-		}
-		$packages[$key]['software_update_inst_id'] = intval($inst['software_update_inst_id']);
-		$packages[$key]['installed'] = $installed_txt;
-		$packages[$key]['csrf_id'] = $_csrf_id;
-		$packages[$key]['csrf_key'] = $_csrf_key;
-	}
-	$app->tpl->setVar('has_packages', 1);
-} else {
-	$app->tpl->setVar('has_packages', 0);
-}
-
-
-
-$app->tpl->setLoop('records', $packages);
-
-$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
-include_once 'lib/lang/'.$app->functions->check_language($language).'_software_package_list.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-
-?>
diff --git a/interface/web/admin/software_repo_del.php b/interface/web/admin/software_repo_del.php
deleted file mode 100644
index 630993717ce6dd20e3e77804bbf4497e6b6c0f2e..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_del.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/software_repo.list.php";
-$tform_def_file = "form/software_repo.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_repo');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
-
-?>
diff --git a/interface/web/admin/software_repo_edit.php b/interface/web/admin/software_repo_edit.php
deleted file mode 100644
index 6d52da2b56799f0274239b42bba857bd4388ec8b..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_edit.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/software_repo.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_repo');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/admin/software_repo_list.php b/interface/web/admin/software_repo_list.php
deleted file mode 100644
index b8afc8f9bc8f6bde874e87e75feb42e93587bd6f..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_list.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/software_repo.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->onLoad();
-
-
-?>
diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php
deleted file mode 100644
index 6d680c0ec1ce613db0e448866dbd0036a30c78fa..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_update_list.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-//* Get the latest updates from the repositorys and insert them in the local database
-$updates_added = 0;
-$repos = $app->db->queryAllRecords("SELECT software_repo_id, repo_url, repo_username, repo_password FROM software_repo WHERE active = 'y'");
-if(is_array($repos)) {
-	foreach($repos as $repo) {
-
-		/*
-		SELECT software_package.package_name, v1, v2, v3, v4
-		FROM software_package
-		LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name )
-		LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
-		GROUP BY package_name
-		ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC
-		*/
-
-		$client = new SoapClient(null, array('location' => $repo['repo_url'],
-				'uri'      => $repo['repo_url']));
-
-		$packages = $app->db->queryAllRecords("SELECT software_package.package_name, v1, v2, v3, v4 FROM software_package LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name ) GROUP BY package_name ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC");
-		if(is_array($packages)) {
-			foreach($packages as $p) {
-
-				$version = $p['v1'].'.'.$p['v2'].'.'.$p['v3'].'.'.$p['v4'];
-				$updates = $client->get_updates($p['package_name'], $version, $repo['repo_username'], $repo['repo_password']);
-
-				if(is_array($updates)) {
-					foreach($updates as $u) {
-
-						$version_array = explode('.', $u['version']);
-						$v1 = $app->functions->intval($version_array[0]);
-						$v2 = $app->functions->intval($version_array[1]);
-						$v3 = $app->functions->intval($version_array[2]);
-						$v4 = $app->functions->intval($version_array[3]);
-
-						$package_name = $u['package_name'];
-						$software_repo_id = $app->functions->intval($repo['software_repo_id']);
-						$update_url = $u['url'];
-						$update_md5 = $u['md5'];
-						$update_dependencies = (isset($u['dependencies']))?$u['dependencies']:'';
-						$update_title = $u['title'];
-						$type = $u['type'];
-
-						// Check that we do not have this update in the database yet
-						$sql = "SELECT * FROM software_update WHERE package_name = ? and v1 = ? and v2 = ? and v3 = ? and v4 = ?";
-						$tmp = $app->db->queryOneRecord($sql, $package_name, $v1, $v2, $v3, $v4);
-						if(!isset($tmp['software_update_id'])) {
-							// Insert the update in the datbase
-							$sql = "INSERT INTO software_update (software_repo_id, package_name, update_url, update_md5, update_dependencies, update_title, v1, v2, v3, v4, type)
-							VALUES ($software_repo_id, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-							//die($sql);
-							$app->db->query($sql, $package_name, $update_url, $update_md5, $update_dependencies, $update_title, $v1, $v2, $v3, $v4, $type);
-						}
-
-					}
-				}
-			}
-		}
-	}
-}
-
-
-//* Install packages, if GET Request
-if(isset($_GET['action']) && $_GET['action'] == 'install' && $_GET['package'] != '' && $_GET['server_id'] > 0) {
-	$package_name = $_GET['package'];
-	$server_id = $app->functions->intval($_GET['server_id']);
-	$software_update_id = $app->functions->intval($_GET['id']);
-
-	$insert_data = array(
-		"package_name" => $package_name,
-		"server_id" => $server_id,
-		"software_update_id" => $software_update_id,
-		"status" => 'installing'
-	);
-	$app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
-
-}
-
-
-
-// Show the list in the interface
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_update_list.htm');
-
-/*
-SELECT software_package.package_name, software_package.package_title, software_update.update_title, v1, v2, v3, v4, software_update_inst.status
-		FROM software_package
-		LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name )
-		LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
-GROUP BY software_update.software_update_id
-		ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC
-*/
-
-
-
-if(isset($_POST["server_id"]) && $_POST["server_id"] > 0) {
-	$server_id = $app->functions->intval($_POST["server_id"]);
-} else {
-	$server_id = 1;
-}
-
-$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
-foreach($servers as $key => $server) {
-	if($server['server_id'] == $server_id) {
-		$servers[$key]['selected'] = 'selected';
-	} else {
-		$servers[$key]['selected'] = '';
-	}
-}
-
-$app->tpl->setLoop('servers', $servers);
-
-$sql = "SELECT v1, v2, v3, v4, software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
-		FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
-		WHERE server_id = $server_id
-		GROUP BY software_update.package_name
-		ORDER BY software_update.package_name ASC, v1 DESC , v2 DESC , v3 DESC , v4 DESC";
-
-$installed_packages = $app->db->queryAllRecords($sql);
-
-
-$records_out = array();
-
-if(is_array($installed_packages)) {
-	foreach($installed_packages as $ip) {
-
-		// Get version number of the latest installed version
-		$sql = "SELECT v1, v2, v3, v4 FROM software_update, software_update_inst WHERE software_update.software_update_id = software_update_inst.software_update_id AND server_id = ? ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC LIMIT 0,1";
-		$lu = $app->db->queryOneRecord($sql, $server_id);
-
-		// Get all installable updates
-		$sql = "SELECT * FROM software_update WHERE v1 >= ? AND v2 >= ? AND v3 >= ? AND v4 >= ? AND package_name = ? ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC";
-		$updates = $app->db->queryAllRecords($sql, $lu['v1'], $lu['v2'], $lu['v3'], $lu['v4'], $ip['package_name']);
-		//die($sql);
-
-		if(is_array($updates)) {
-			// Delete the last record as it is already installed
-			unset($updates[count($updates)-1]);
-
-			foreach($updates as $key => $u) {
-				$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
-				$installed_txt = "<a href=\"#\" data-load-content=\"admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."\">Install Update</a><br />";
-				$records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
-
-			}
-		}
-	}
-}
-
-
-
-$app->tpl->setLoop('records', $records_out);
-
-$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
-include_once 'lib/lang/'.$app->functions->check_language($language).'_software_update_list.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-
-?>
diff --git a/interface/web/admin/templates/software_package_edit.htm b/interface/web/admin/templates/software_package_edit.htm
deleted file mode 100644
index 2569c267f0d55b6dc967118bc03e79ff8ae15c44..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_edit.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
-        
-            <div class="form-group">
-                <label for="package_title" class="col-sm-3 control-label">{tmpl_var name='package_title_txt'}</label>
-                {tmpl_var name='package_title'}<input name="package_title" id="package_title" value="{tmpl_var name='package_title'}" size="40" maxlength="40" type="hidden" class="textInput" />
-            </div>
-            <div class="form-group">
-                <label for="package_key" class="col-sm-3 control-label">{tmpl_var name='package_key_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="package_key" id="package_key" value="{tmpl_var name='package_key'}" class="form-control" /></div></div>
-        
-            
-        <input type="hidden" name="id" value="{tmpl_var name='id'}">
-            
-        <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_package_edit.php">{tmpl_var name='btn_save_txt'}</button>
-            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_install.htm b/interface/web/admin/templates/software_package_install.htm
deleted file mode 100644
index 8524b3c08755982c38b050d12e8b45ee1d955d72..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_install.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class='page-header'>
-	<h1><tmpl_var name="head_txt"></h1>
-</div>
-<p><tmpl_var name="desc_txt"></p>
-
-<div class="panel panel_software_repo">
-    <tmpl_if name="message_err">
-        <div id="errorMsg"><tmpl_var name="message_err"></div>
-    </tmpl_if>
-    <tmpl_if name="message_ok">
-        <div id="OKMsg"><tmpl_var name="message_ok"></div>
-    </tmpl_if>
-    <tmpl_if name="insert_key">
-        <div class="pnl_formsarea">
-            
-                <p>&nbsp;</p>
-                <div class="form-group">
-                    <label for="install_key" class="col-sm-3 control-label">{tmpl_var name='install_key_txt'}</label>
-                    <div class="col-sm-9"><input type="text" name="install_key" id="install_key" value="{tmpl_var name='install_key'}" class="form-control" /></div></div>
-                    
-                <input type="hidden" name="package" value="{tmpl_var name='package_name'}">
-                <input type="hidden" name="server_id" value="{tmpl_var name='server_id'}">
-                <p>&nbsp;</p>
-                <div class="clear"><div class="right">
-                    <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_package_install.php">{tmpl_var name='btn_save_txt'}</button>
-                    <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-                </div></div>
-            
-        </div>
-    </tmpl_if>
-</div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
deleted file mode 100644
index e69e3780af4e3ccff25906c9a5867f46b8b19f5c..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_list.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
-        <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
-                <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/software_package_list.php?action=repoupdate">{tmpl_var name="repoupdate_txt"}</button>
-            
-        
-
-    
-        <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
-            <div class="table-wrapper marginTop15">
-<table class="table">
-                <thead class="dark form-group-sm">
-                    <tr>
-                        <th data-column="installed"><tmpl_var name="installed_txt"></th>
-                        <th data-column="package_title"><tmpl_var name="package_title_txt"></th>
-                        <th data-column="package_description"><tmpl_var name="package_description_txt"></th>
-                        <th data-column="package_id"><tmpl_var name="package_id_txt"></th>
-                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
-                    </tr>
-                </thead>
-                <tbody>
-					<tmpl_loop name="records">
-                        <tmpl_if name="has_packages">
-						<tr>
-                            <td>{tmpl_var name="installed"}</td>
-                            <td>{tmpl_var name="package_title"}</td>
-                            <td>{tmpl_var name="package_description"}</td>
-                            <td>ispapp{tmpl_var name="package_id"}</td>
-							<td class="text-right">
-								<a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span class="icon icon-edit"></span></a>
-                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
-                            </td>
-                        </tr>
-						</tmpl_if>
-                    </tmpl_loop>
-                    <tmpl_unless name="records">
-                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="5">{tmpl_var name='no_packages_txt'}</td>
-                        </tr>
-                    </tmpl_unless>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td colspan="5"></td>
-                    </tr>
-                </tfoot>
-            </table>
-</div>
-        
-    
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm
deleted file mode 100644
index a43ea74900dddbd01d8091792acddadf45a15764..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_repo_edit.htm
+++ /dev/null
@@ -1,26 +0,0 @@
-            <div class="form-group">
-                <label for="repo_name" class="col-sm-3 control-label">{tmpl_var name='repo_name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" class="form-control" /></div></div>
-            <div class="form-group">
-                <label for="repo_url" class="col-sm-3 control-label">{tmpl_var name='repo_url_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" class="form-control" /></div></div>
-            <div class="form-group">
-                <label for="repo_username" class="col-sm-3 control-label">{tmpl_var name='repo_username_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" autocomplete="off" class="form-control" /></div></div>
-            <div class="form-group">
-                <label for="repo_password" class="col-sm-3 control-label">{tmpl_var name='repo_password_txt'}</label>
-                <div class="col-sm-9"><input type="password" name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" autocomplete="off" class="form-control" /></div></div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
-                <div class="col-sm-9">
-                    {tmpl_var name='active'}
-                </div>
-            </div>
-        
-            
-        <input type="hidden" name="id" value="{tmpl_var name='id'}">
-            
-        <div class="clear"><div class="right">
-            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_repo_edit.php">{tmpl_var name='btn_save_txt'}</button>
-            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_repo_list.php">{tmpl_var name='btn_cancel_txt'}</button>
-        </div></div>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
deleted file mode 100644
index d408896de6f943ba0a5d23240f37eefb58dc858a..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_repo_list.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
-        <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-            
-                <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/software_repo_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-            
-        
-
-    
-        <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
-            <div class="table-wrapper marginTop15">
-<table class="table">
-                <thead class="dark form-group-sm">
-                    <tr>
-                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
-                        <th data-column="repo_name"><tmpl_var name="repo_name_txt"></th>
-                        <th data-column="repo_url"><tmpl_var name="repo_url_txt"></th>
-                        <th class="text-right">&nbsp;</th>
-                    </tr>
-                    <tr>
-                        <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
-                        <td><input class="form-control" type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
-                        <td><input class="form-control" type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
-                        <td class="text-right">
-                            <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/software_repo_list.php"><span class="icon icon-filter"></span></button>
-                        </td>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tmpl_loop name="records">
-                        <tr>
-                            <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
-                            <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_name"}</a></td>
-                            <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_url"}</a></td>
-                            <td class="text-right">
-                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/software_repo_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
-                            </td>
-                        </tr>
-                    </tmpl_loop>
-                    <tmpl_unless name="records">
-                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
-                        </tr>
-                    </tmpl_unless>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td colspan="4"><tmpl_var name="paging"></td>
-                    </tr>
-                </tfoot>
-            </table>
-</div>
-        
-    
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
deleted file mode 100644
index 6776b66a7a04ea4d3feb66fbe99dcf9b3e072b98..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_update_list.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class='page-header'>
-	<h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
-        <legend>Tools</legend>
-            
-                <div class="form-group">
-                    <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_select_txt'}</label>
-                    <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','admin/software_update_list.php');">
-                        <tmpl_loop name="servers">
-                            <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
-                        </tmpl_loop>
-                    </select></div>
-                
-        
-    </div>
-  
-    
-        <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
-            <div class="table-wrapper marginTop15">
-<table class="table">
-                <thead class="dark form-group-sm">
-                    <tr>
-                        <th data-column="installed"><tmpl_var name="installed_txt"></th>
-                        <th data-column="update_title"><tmpl_var name="update_title_txt"></th>
-                        <th data-column="version"><tmpl_var name="version_txt"></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tmpl_loop name="records">
-                        <tr>
-                            <td>{tmpl_var name="installed"}</td>
-                            <td>{tmpl_var name="update_title"}</td>
-                            <td>{tmpl_var name="version"}</td>
-                        </tr>
-                    </tmpl_loop>
-                    <tmpl_unless name="records">
-                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="3">{tmpl_var name='no_updates_txt'}</td>
-                        </tr>
-                    </tmpl_unless>
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td colspan="3"></td>
-                    </tr>
-                </tfoot>
-            </table>
-</div>
-        
-    
\ No newline at end of file
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/login/password_reset.php b/interface/web/login/password_reset.php
index 2e1d5e6aad0c912a7f3c9f7a82efb259735b78df..db4ad71c22d2614566b0c2658cb4254ee8e7afdb 100644
--- a/interface/web/login/password_reset.php
+++ b/interface/web/login/password_reset.php
@@ -153,6 +153,7 @@ if(isset($_POST['username']) && is_string($_POST['username']) && $_POST['usernam
 
 			if($send_result !== false) {
 				$app->tpl->setVar("msg", $wb['pw_reset']);
+				$app->tpl->setInclude('content_tpl', 'templates/index.htm');
 			} else {
 				$app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']);
 			}
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index e03e58f1f1451c0716e433f63ae557534f2137ed..64b1825073fe663dd22e5fde695ec56c1426e8b5 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -1,3 +1,6 @@
+					<tmpl_if name="msg">
+					<div class="alert alert-success" role="alert"><tmpl_var name="msg"></div>
+					</tmpl_if>
 					<tmpl_if name="error">
 					<div class="alert alert-danger" role="alert"><tmpl_var name="error"></div>
 					</tmpl_if>
diff --git a/interface/web/mail/form/mail_blacklist.tform.php b/interface/web/mail/form/mail_blacklist.tform.php
index 957f35b95bfad2bb6263b79afd4f3e4f62104941..35272e4cd4be8f9d22812eb5faa2fd39349b7325 100644
--- a/interface/web/mail/form/mail_blacklist.tform.php
+++ b/interface/web/mail/form/mail_blacklist.tform.php
@@ -98,7 +98,7 @@ $form["tabs"]['blacklist'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'y',
-			'value'  => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
+			'value'  => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
 		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
@@ -112,5 +112,8 @@ $form["tabs"]['blacklist'] = array (
 	)
 );
 
+if (! $app->auth->is_admin()) {
+	$form['tabs']['blacklist']['fields']['type']['value'] = array('recipient' => 'Recipient', 'sender' => 'Sender');
+}
 
 ?>
diff --git a/interface/web/mail/form/mail_domain.tform.php b/interface/web/mail/form/mail_domain.tform.php
index 5c8fa0185ac9bf0364315836152b1e7e87ff0548..6e768193e03c0386e5d9e7108690a8317728ab51 100644
--- a/interface/web/mail/form/mail_domain.tform.php
+++ b/interface/web/mail/form/mail_domain.tform.php
@@ -136,6 +136,30 @@ $form["tabs"]['domain'] = array (
 					'errmsg'=> 'dkim_selector_error'),
 			),
 		),
+		'relay_host' => array(
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'default' => '',
+				'value' => '',
+				'width' => '40',
+				'maxlength' => '255'
+		),
+		'relay_user' => array(
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'default' => '',
+				'value' => '',
+				'width' => '40',
+				'maxlength' => '255'
+		),
+		'relay_pass' => array(
+				'datatype' => 'VARCHAR',
+				'formtype' => 'TEXT',
+				'default' => '',
+				'value' => '',
+				'width' => '40',
+				'maxlength' => '255'
+		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/mail/form/mail_domain_catchall.tform.php b/interface/web/mail/form/mail_domain_catchall.tform.php
index c43aeb333902a9abe52bb1f7e0f1c5da0d8aa009..95e10354cc78cbd10b8da1371cebb2e60bc260c8 100644
--- a/interface/web/mail/form/mail_domain_catchall.tform.php
+++ b/interface/web/mail/form/mail_domain_catchall.tform.php
@@ -125,6 +125,12 @@ $form["tabs"]['catchall'] = array (
 			'default' => '',
 			'value'  => array('alias' => 'Alias', 'forward'=>'Forward', 'catchall'=>'Catchall')
 		),
+		'allow_send_as' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(1 => 'y', 0 => 'n')
+		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',
diff --git a/interface/web/mail/form/mail_whitelist.tform.php b/interface/web/mail/form/mail_whitelist.tform.php
index edd32483712bedea9b430d2f5cba5de346a73fb7..01f3d5dab78294d19e9178b8bec4431cdc92cb77 100644
--- a/interface/web/mail/form/mail_whitelist.tform.php
+++ b/interface/web/mail/form/mail_whitelist.tform.php
@@ -104,7 +104,7 @@ $form["tabs"]['whitelist'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => 'y',
-			'value'  => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')
+			'value'  => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')
 		),
 		'active' => array (
 			'datatype' => 'VARCHAR',
@@ -118,5 +118,9 @@ $form["tabs"]['whitelist'] = array (
 	)
 );
 
+if (! $app->auth->is_admin()) {
+	$form['tabs']['whitelist']['fields']['type']['value'] = array('recipient' => 'Recipient', 'sender' => 'Sender');
+}
+
 
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_blacklist.lng b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
index 5b2815c0d00a2e2c3f96064cfd11561472e8ed78..81a1b6d279d0d2c11c7fc35465394e97ff229d0b 100644
--- a/interface/web/mail/lib/lang/ar_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng
index 4d99d0fb5ea2c827c5944d5768451fabfa389562..e53c5d9ec217cb583a70dd6237d8c3d8484bc0a4 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -19,5 +19,7 @@ $wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
-$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this accounte';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/ar_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ar_mail_domain_catchall.lng
index 55cc10358e1c6ddd5e81834034dd316efad24b5a..b55657faf691bdd0be80172f8e6f0cccdc4c7e08 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'The max. number of email catchall accounts for
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/ar_mail_whitelist.lng b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
index 92c365ba2b55b1f47c63880b3722132cf6842950..f6fda2d6d4d5c5c16fe7fca47177731c3140e9e5 100644
--- a/interface/web/mail/lib/lang/ar_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ar_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/bg_mail_blacklist.lng b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
index e250039e2edc54a09944c432c1c71252f3e6c840..7886cb6fa6a91cc77f46fe305159572f16eb17c6 100644
--- a/interface/web/mail/lib/lang/bg_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng
index 6e30a26494a6f3eb6610d46c12567ae013ee3741..f2d329a62ec96e1a1a5afbea6af63694f3977503 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['policy_txt'] = 'Спамфилтър';
 $wb['no_policy'] = '- не е разрешен -';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/bg_mail_domain_catchall.lng b/interface/web/mail/lib/lang/bg_mail_domain_catchall.lng
index 06f1f01e11708e8921c96e39290bc03d8f6fa33d..346ddad909b7d161d97fdcf61ec1fb4a0e7f5e18 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Максималният брой записи
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/bg_mail_whitelist.lng b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
index 35c892add4adb43a689d904b64becec6af78766a..deef7ae35660c1704ab6db65e867653521a9b0fb 100644
--- a/interface/web/mail/lib/lang/bg_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/bg_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/br_mail_blacklist.lng b/interface/web/mail/lib/lang/br_mail_blacklist.lng
index 516946ce198e1b25329a3e67cc311703040c5571..d33aa6c1388c9d52d36887f6278f4760a9bdd3ab 100644
--- a/interface/web/mail/lib/lang/br_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/br_mail_blacklist.lng
@@ -6,3 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index 8cf2cdce658196eb0c76a4ccd566d103626ef4de..7371f51894a2af03bbbdb6497ce85f513e0b78bc 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -20,3 +20,6 @@ $wb['no_policy'] = '-desabilitado-';
 $wb['error_not_allowed_server_id'] = 'O servidor selecionado não é permitido para esta conta.';
 $wb['dkim_selector_txt'] = 'Seletor DKIM';
 $wb['dkim_selector_error'] = 'Seletor DKIM é inválido. Utilize apenas caracteres alfanuméricos em minúsculas (a-z ou 0-9) e no máximo 63 caracteres.';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/br_mail_domain_catchall.lng b/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
index 3d4f85af8dfc1110b3bf508e3705dfb76623aff4..3bc3b78d0455f7e490f2f91e153d0a4d093e59d9 100644
--- a/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain_catchall.lng
@@ -10,4 +10,5 @@ $wb['domain_txt'] = 'Domínio';
 $wb['source_txt'] = 'Origem';
 $wb['destination_error_isemail'] = 'Endereço de e-mail de destino é inválido.';
 $wb['greylisting_txt'] = 'Habilitar greylist';
-?>
+$wb['send_as_txt'] = 'Enviar como';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/br_mail_whitelist.lng b/interface/web/mail/lib/lang/br_mail_whitelist.lng
index e62e5a778e6817797bfbf956417ca5fdf6ce7230..f458dbbfb262bb339392f38d1b4a5124060d04df 100644
--- a/interface/web/mail/lib/lang/br_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/br_mail_whitelist.lng
@@ -6,3 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ca_mail_blacklist.lng b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
index 3f5f9709e84b156c84043a4cf5c4cce65d7fff91..b4232033216f6372a672cab7e27d7ab41fa5fcd1 100644
--- a/interface/web/mail/lib/lang/ca_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng
index 65d664cf3a7e5a761b17f02b4c538de13e669f33..0b701a16c3ef8443fee0ea3bf26c271f8cad4aee 100644
--- a/interface/web/mail/lib/lang/ca_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ca_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
index feafd436f6bb47963d8429b11ae4ae80ab686458..5499c5a11d520d0f8dce647a7e46c050e65b2f30 100644
--- a/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Le nombre maximal de comptes collecteurs pour v
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'La destination n\'est pas valide.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/ca_mail_whitelist.lng b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
index 0d621c95f3bc53a44b0ce1061f048c97573f370b..a85c7939c3950a11cc1fd5383ad858a09291c705 100644
--- a/interface/web/mail/lib/lang/ca_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 250d3a7ffa053acfe8f5be58c4c355f6a137b036..e95a23a3de8c1482ef65e7b30dc95c6bb4397b16 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -6,3 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index 2d1adc034344a51a4f7462ec189a34b2b73e72f1..0c648a68f33aadf8b14163aa7c33ec95459d7f91 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -20,3 +20,6 @@ $wb['dkim_selector_error'] = 'Neplatný DKIM selektor. Používejte pouze malá
 $wb['policy_txt'] = 'Spamový filtr';
 $wb['no_policy'] = '- nepovoleno -';
 $wb['error_not_allowed_server_id'] = 'Zvolený server není povolen pro tento účet.';
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index 0ca32d2347521eeb0ec1c01c41f3a0a19fc8793e..a425cb74a6e86b3728fe779c2d4dd923ff8b64f3 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,3 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Byl dosažen maximální počet košů účtů
 $wb['source_txt'] = 'Zdroj';
 $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.';
 $wb['greylisting_txt'] = 'Povolit greylisting';
+$wb['send_as_txt'] = 'Odeslat jako';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index c96f21909a39c8d4736c14d18b813a8aa404d47c..e775902fa869abd699315eac84fdc53b9da34a87 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -6,3 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/de_mail_blacklist.lng b/interface/web/mail/lib/lang/de_mail_blacklist.lng
index 4611dadd063c6eefcf51a2cada37f663975b2c05..7cb69f74bc32417a5211871ad27cdd4a01959494 100644
--- a/interface/web/mail/lib/lang/de_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/de_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 13aac42c79a437f7c60504f7859cac0f23615a0b..1a64a442313cc21dd6adeb0b895aba31729f33dc 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector.  Verwenden Sie nur max. 63 alphanumerische Zeichen (a-z oder 0-9)';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
index bef241e0ea6aabea07f902ff7529ac431de75c08..02fe5f100046661277b46c27d9b90a8128d9b8df 100644
--- a/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Die maximale Anzahl an Catchall Einträgen für
 $wb['source_txt'] = 'Quelle';
 $wb['destination_error_isemail'] = 'Das Ziel ist keine gültige E-Mail Adresse.';
 $wb['greylisting_txt'] = 'Aktiviere Greylisting';
-?>
+$wb['send_as_txt'] = 'Senden als';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/de_mail_whitelist.lng b/interface/web/mail/lib/lang/de_mail_whitelist.lng
index 1506deba3f92bcd98b26d8a699e6171e6e039fa5..04719f2479a9d6671fee9c8534d50891ebbfde03 100644
--- a/interface/web/mail/lib/lang/de_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/de_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/dk_mail_blacklist.lng b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
index 2830319b06fccc99f723e2059eb759a11ba71ab1..708b10fcb4515b46bf4116aedc2389730473e4f4 100644
--- a/interface/web/mail/lib/lang/dk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/dk_mail_domain.lng b/interface/web/mail/lib/lang/dk_mail_domain.lng
index f37b81d65e493fed5780267b48a21ded712ea19c..fcced58e1addb02e3fe37353f642a2f51cb2bff2 100644
--- a/interface/web/mail/lib/lang/dk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/dk_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/dk_mail_domain_catchall.lng b/interface/web/mail/lib/lang/dk_mail_domain_catchall.lng
index 8c0be4977599589207235c7a56a99e9a326182f7..1025ca28984eba1aa4f75330e2849c54efc10dcd 100644
--- a/interface/web/mail/lib/lang/dk_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/dk_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Max. antal af e-mail catchall konti for din kon
 $wb['source_txt'] = 'Kilde';
 $wb['destination_error_isemail'] = 'Destinationen er ikke en gyldig e-mail adresse.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/dk_mail_whitelist.lng b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
index a05c234f943b27fd395e01cd8a8feae829bd196d..2efac1cfa413c9cc85dc3b8f1e648fa1abd99e67 100644
--- a/interface/web/mail/lib/lang/dk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/dk_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/el_mail_blacklist.lng b/interface/web/mail/lib/lang/el_mail_blacklist.lng
index 479a3deb0168c44221f7a64a8872e44a780a9659..d7b27ff7d7b93d8fbd9a44fbbec01719d78df3e0 100644
--- a/interface/web/mail/lib/lang/el_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/el_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index 3973746dfd5d47000a68602250c7e8d6685751b2..3909576a3c8d36cbdb1cc5b2e9d40a347eb16091 100644
--- a/interface/web/mail/lib/lang/el_mail_domain.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
index b04b43cfcce3e4f179a14d74e02ac30c82dc5d63..9d097c2d42b854ee96a4f8fd6d3d83f315f20824 100644
--- a/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Το μέγιστο πλήθος των email c
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/el_mail_whitelist.lng b/interface/web/mail/lib/lang/el_mail_whitelist.lng
index 6c477f60c2b4f0bd2b0bed463245abb0b4c6336b..601a53434fc55862caaffd105d725df808f88950 100644
--- a/interface/web/mail/lib/lang/el_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/el_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/en_mail_blacklist.lng b/interface/web/mail/lib/lang/en_mail_blacklist.lng
index 8bae57d6b0d50a40e668d353a9a09afc7117d0f2..81a1b6d279d0d2c11c7fc35465394e97ff229d0b 100644
--- a/interface/web/mail/lib/lang/en_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/en_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng
index 0190c0ab0696df773f136728309b5b7cd808e0bb..39e22f75b6219addb8f7ceede6d49928934e595c 100644
--- a/interface/web/mail/lib/lang/en_mail_domain.lng
+++ b/interface/web/mail/lib/lang/en_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['no_policy'] = '- not enabled -';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
index ecbb8d9444bf744f0e15abeb532c3dcf273972c4..6af61df4b061475803a3f6280f1b55686cc49e23 100644
--- a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng
@@ -10,4 +10,5 @@ $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/en_mail_whitelist.lng b/interface/web/mail/lib/lang/en_mail_whitelist.lng
index f7e4ab881f8343a93a6bfcd9946256ee8a756a26..351a0574d3cb1ed7238569ad4905d3090db388a5 100644
--- a/interface/web/mail/lib/lang/en_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/en_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/es_mail_blacklist.lng b/interface/web/mail/lib/lang/es_mail_blacklist.lng
index 81ae71c57579910dce7e27c264fa2745a2b1ef07..0956e6f5e40416151ddaca2d936b2b42ace27ccb 100644
--- a/interface/web/mail/lib/lang/es_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/es_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng
index 36c5ae576308d73cc2ddbd0b24a0b991d0926385..bd23b94191934ba8d40d236b56e11b37894ca30b 100644
--- a/interface/web/mail/lib/lang/es_mail_domain.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['no_policy'] = '- no habilitado -';
 $wb['policy_txt'] = 'Filtro de spam';
 $wb['server_id_txt'] = 'Servidor';
 $wb['type_txt'] = 'Tipo';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/es_mail_domain_catchall.lng b/interface/web/mail/lib/lang/es_mail_domain_catchall.lng
index 68e03c8c3712d4e5730303d782022fc2fd31bcc6..8ff7c6530e83f8ee6202379bd22488e7b91c7bc6 100644
--- a/interface/web/mail/lib/lang/es_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Ha alcanzado el número máx. de correo \\"reco
 $wb['no_domain_perm'] = 'No tiene permisos para usar este dominio.';
 $wb['source_txt'] = 'Origen';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Enviar como';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/es_mail_whitelist.lng b/interface/web/mail/lib/lang/es_mail_whitelist.lng
index e92979f13ce39c9180aa4bd0a9bbf4ff058cc3df..af5362d2e06ef2f4b45a5526297a0312f0d09f22 100644
--- a/interface/web/mail/lib/lang/es_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/es_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fi_mail_blacklist.lng b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
index 66cb93004e643e787eb070d5a9fc237ace48f8a1..f24d79d80f9b442051dd837137aab4fdaa1339cb 100644
--- a/interface/web/mail/lib/lang/fi_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index 088c768091659f8297debdaeb596e9b4e21d0b18..d77fe325004fddf591bef88d176a6b865995bfe2 100644
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
index 085a116c2c76ae262b97e7220c6e9a8813965eae..743da590ae9f74176b27f09684c04252efdf91ad 100644
--- a/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/fi_mail_whitelist.lng b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
index abd8e85f2b9cb8ca60adac31dc76acce40396ed2..c5d317a42cb1ade3e884ec849511873f710ddd64 100644
--- a/interface/web/mail/lib/lang/fi_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fi_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist.lng b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
index 161acd632ddea126dc1e2f472961fb733b2358fd..649d94c1dc24db4b54718865eea4ae48ce717a9d 100644
--- a/interface/web/mail/lib/lang/fr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng
index eebbdc02b164dbe4b8a24cb13ed10107a17469bd..56efb88aae308647e2e0c041a0e089301dc05d45 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
index 199cd47224810f26214d75b82615ddb4b8ec5bfc..9ba28dcfb65bb402f74dcc3e4252a04f386efc67 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Le nombre maximal de comptes collecteurs pour v
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid e-mail address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist.lng b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
index f11d0b76a747cc01150ab503003bc77e28911170..bc768e77a1eddfafd9888c57e34374943b81fe34 100644
--- a/interface/web/mail/lib/lang/fr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
index dbce8de10d73e7297f3c81c697f1eb5f23f2c3af..3a542e2a82879e1edd547fb8ce375829a0aabf8d 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index eb91862b311b0c1a7d82c40758990029d86efee0..2f53c694c80f79bef6ac8bdd811cfa8068ee4530 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
index 1c8da72ab3ee0107c9b09b518cfc5e6c677a5ba7..ef6dc1d0cff4d103374434ff4b9538762f9725cf 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Iskorišten ja maksimalan broj email catchall r
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index a43e8eef466b41cd55c1868048820f12215d9431..4d4643e6da320a584985cf67fee8442566e6dc0e 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hu_mail_blacklist.lng b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
index 1d2f0e014ecac7e1d1c3f940ab6b84c0e4b45721..8b97aa868d99221c7ec9da9890ddd19451290962 100644
--- a/interface/web/mail/lib/lang/hu_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
index 431beb8a013fc3c3bfa30cb75bd43171a37be20a..96a5dc03a51233e168098b6e9d655e98f57bd0c9 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng b/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng
index e26795953dc06ac0ae227577a9bdbaaefc06f72b..9e164ea19c3c17a2e6909c48d09010cc24e9d626 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Nincs több catchall lehetőség.';
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/hu_mail_whitelist.lng b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
index 71c3cf39bbc118667588f71ab6a18b66794e96df..9db70ac0ebf5af654d682ed9d25325c4b867ef21 100644
--- a/interface/web/mail/lib/lang/hu_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hu_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/id_mail_blacklist.lng b/interface/web/mail/lib/lang/id_mail_blacklist.lng
index 4454a33c2409a614199b711e97bc72a7996a1a45..4416ce17e459acc01858311b67cc60dc158d74f6 100644
--- a/interface/web/mail/lib/lang/id_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/id_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng
index c13968dde83b3dc02286fcd9a2f0f43cb8bbe2af..2979773e8c9183af092abba17b866cb5390bc0e4 100644
--- a/interface/web/mail/lib/lang/id_mail_domain.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/id_mail_domain_catchall.lng b/interface/web/mail/lib/lang/id_mail_domain_catchall.lng
index c380957fdc210a831adacd6059a232378ee4fe79..69f2837385572ed4f6e2a3c440da088c42e29622 100644
--- a/interface/web/mail/lib/lang/id_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Jumlah maks akun catchall email untuk akun Anda
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/id_mail_whitelist.lng b/interface/web/mail/lib/lang/id_mail_whitelist.lng
index 52dd134271f37eda1f4322b39936e587266994a5..7eff21f47c7b5e7ef05434b37dfb5cb18863fa79 100644
--- a/interface/web/mail/lib/lang/id_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/id_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/it_mail_blacklist.lng b/interface/web/mail/lib/lang/it_mail_blacklist.lng
index 169015d65844c7c1948cc694fff7081c9c5d5a1f..0b4f16a7c4bd447fe87cb7e891d5c2b11b3d541c 100644
--- a/interface/web/mail/lib/lang/it_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/it_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng
index 46089adb90d2538e76c83aa6b46dc1bd60324252..88e2c146df0a0c5e15cd28432635c65edc9b20b7 100644
--- a/interface/web/mail/lib/lang/it_mail_domain.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/it_mail_domain_catchall.lng b/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
index 3345bed9c7e646b0cdab80cee00daa478c60a9cf..7403fcd663c0a042eb30938606a128e3de9ad238 100644
--- a/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'The max. number of email catchall accounts ragg
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/it_mail_whitelist.lng b/interface/web/mail/lib/lang/it_mail_whitelist.lng
index c63f5759f4296fa82b038d7435f4e5a1bf47fb05..fbc9980fed0991ef1c1919811ed3b336fa0fa5dc 100644
--- a/interface/web/mail/lib/lang/it_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/it_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ja_mail_blacklist.lng b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
index 9007f6bb03de75efbc9877f14001161a3455e838..f20f0377a79581c779f19585d0a2cce666bed075 100644
--- a/interface/web/mail/lib/lang/ja_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng
index 787937668c7a5fc0f7f9e24617ea1c577fe7a6e0..a96faaa367643c34ad2168927d2e26042cff8456 100644
--- a/interface/web/mail/lib/lang/ja_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ja_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['no_policy'] = '使わない';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/ja_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ja_mail_domain_catchall.lng
index 6da7d05c5608ab897af68322f7c5a6e1203a84fd..28e009efe1de5ec9e38b4edd076f6961ecca8e6b 100644
--- a/interface/web/mail/lib/lang/ja_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ja_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'キャッチオールアカウントが最大
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/ja_mail_whitelist.lng b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
index 74d51da927e3d437cdcf64b026dd43674bc3c932..40d9ac32a38c635f023b0efccf2d8e4db45606c6 100644
--- a/interface/web/mail/lib/lang/ja_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ja_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
index baa7b1ebba78ab8731efa719d7072d90faf4606b..e5a16aa6e0764d7e3308db4dfcc56656984011e7 100644
--- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index c4fe53c71893286ccc312710798a7b2256813139..0e8a912a71dc814f48a3dde7bed991b187a7b2ae 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
index ee9c1f7678ae28fb04365a245a331d5848c1397f..37e5c80abc2d86b960a970c362f7d3ab91d24905 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Het max. aantal e-mail catchall accounts voor u
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
index 604110edd55f3e73be41f805c46cea4ef420f22a..c91e09576877f05d160df4b77bb3c49e593e26c3 100644
--- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
index 528f2f741aee3944e1f99f015010dee5fc0a140a..28eba8e32a6da77c15d241c37c49ac5ddff09593 100644
--- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index e4483a0d641fd08c18c92c46ddb5fcb56ae3ae20..7ff3c297fff625d0dcaba6a4d48e14b44ca6eb54 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
index fad83875ca1b49db9b09a750e13b07c08348e2e6..644e90e6c5e3dd8fb464925ba766a6e924047409 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Maksymalna ilość kont e-mail catchall dla Two
 $wb['source_txt'] = 'Źródło';
 $wb['destination_error_isemail'] = 'Cel nie jest poprawnym adresem email.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
index 203c5bae73b49489f47af28011cae1646f4880fd..f18521fe7f451ed6ae963a8be04331a54e465237 100644
--- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pt_mail_blacklist.lng b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
index b7be9be47761be813f051d4b712b081d83ef62ee..40fc089e0de2eccaa01f0e2d72857bd801f62ebf 100644
--- a/interface/web/mail/lib/lang/pt_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng
index 224a38a2e1ad21b8d5ede91973577613cd2b0cef..092f83f1cacc166cfb067a88b35a1ff969d563a2 100644
--- a/interface/web/mail/lib/lang/pt_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pt_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/pt_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pt_mail_domain_catchall.lng
index e81afd74b904f757edfe264b9146c95d64099ce3..8d8bac47bfc3ca5f5769973e03e56ebf33250be1 100644
--- a/interface/web/mail/lib/lang/pt_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/pt_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'O número máximo de catchall para este domíni
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/pt_mail_whitelist.lng b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
index 92cc78d80dda3724e35c90f8e1f690dbf6e5f9dd..678fb8257080b63e1b4f9271e1a0103aa19e6d0d 100644
--- a/interface/web/mail/lib/lang/pt_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/pt_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ro_mail_blacklist.lng b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
index a0feb782628495633fa6eda926e034ff859b1b43..6416e190fe3c2c2ca8aa3ecc83f3242fd8dd48cf 100644
--- a/interface/web/mail/lib/lang/ro_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng
index ede56e351ed81099ff0610cb541a44736c3670e1..e0543f36ec34696741999ef853fe58e730469e33 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/ro_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ro_mail_domain_catchall.lng
index c0689ca04465f0174fae8f64c43df4ef5d9d7d21..9de50490ad3ef5de39d0e5d5ae22d5c14a2c8985 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'numarul maxim de CATCHALL pe contul dumneavoatr
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/ro_mail_whitelist.lng b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
index 7a3f9f515cff3ecdfb765e7b21ad3f5e6dfc5ae4..b5ec3d1e9224e1c5fb7d4e85b5e47077f359059c 100644
--- a/interface/web/mail/lib/lang/ro_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ro_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist.lng b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
index 986935386e8d9c0dc85ac0f48ed3cc29d0a02b44..33ef780ebd57c8ceec54127820184552da0d0cd8 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng
index adc1ac74cb19f282839e437d3a754b1224aa7de6..7567e3c67021d8976ced17565929119aa8e42424 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['dkim_selector_txt'] = 'DKIM-селектор';
 $wb['dkim_selector_error'] = 'Некорректный DKIM-селектор. Используйте только строчные буквенно-цифровые символы (a-z или 0-9) до 63 символов';
 $wb['error_not_allowed_server_id'] = 'Выбранный сервер не доступен для этой учетной записи.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
index 25349ca4972447406c55fcfa33558bbd548286a7..13ba70c92c2cdd04efc54c5ed9b0f834b3e29ff0 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Максимальное число Макс. 
 $wb['source_txt'] = 'Источник';
 $wb['destination_error_isemail'] = 'Не выбран получатель или запись некорректна.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Отправить как';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist.lng b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
index bd8a1ae06b5d79174682ceef92a9c2d3278e2ab0..0e7a8f95b30a08a69644bbd0ab6b9b7389a5a1f7 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/se_mail_blacklist.lng b/interface/web/mail/lib/lang/se_mail_blacklist.lng
index 34b1f76db96f694b1701f0aa4f2d6290ec03f1f4..82dc7e3fdc8181a5ef4e6b784d1d64021c5f899c 100644
--- a/interface/web/mail/lib/lang/se_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/se_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index fcd87813ba65e13ae56347fda1917bf114caa201..7f192224e672a07b7e62cb5a38a2cfe14574df50 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanu
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['no_policy'] = '- ej aktiverat -';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/se_mail_domain_catchall.lng b/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
index 39c6e6c55943bb69f20f95d8aee594becf10e700..6724ff32041d4eb756d079d25df0c1f674c68ee0 100644
--- a/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Det maximala antalet catchall-adresser för dit
 $wb['source_txt'] = 'Källa';
 $wb['destination_error_isemail'] = 'Destinationen när inte en giltig epostadress.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/se_mail_whitelist.lng b/interface/web/mail/lib/lang/se_mail_whitelist.lng
index 7ce682ff6b83d2645fc92b43d77e1bc01060845e..d312ec947084e2ee6112d1d51bde3271eec42f5a 100644
--- a/interface/web/mail/lib/lang/se_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/se_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/sk_mail_blacklist.lng b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
index d5775a66420d623f659aea37ded6d0e768209623..277a7bf1ec3e8a047e1c8331c05f6908189ad8c6 100644
--- a/interface/web/mail/lib/lang/sk_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng
index dfe8ce88997e3a3a07954662e7e8cb2dcda20e82..ed67d200441cfe685faeac5f4f4a19e1c6602134 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['no_policy'] = '- Nie je aktivovaný -';
 $wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/sk_mail_domain_catchall.lng b/interface/web/mail/lib/lang/sk_mail_domain_catchall.lng
index 03c701c6db9edef1841ce6f03cc7d85059d486b9..012a585ee878ccca90235d4b7a7e565dbfc55caa 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Max. počet e-mailových doménových košov pr
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 $wb['greylisting_txt'] = 'Enable greylisting';
-?>
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/sk_mail_whitelist.lng b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
index 6e2107a0d8d304520c5f91083ef9858cf8d0da10..77e44841fd188209aca8af9b9fd04016410d35e0 100644
--- a/interface/web/mail/lib/lang/sk_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/sk_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/tr_mail_blacklist.lng b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
index 381a11fa98c2f651fd77a823bff5c88e4cb0ebda..7712ca086d3721b9718a5857ec607b67df745e35 100644
--- a/interface/web/mail/lib/lang/tr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_blacklist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Blacklist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng
index 3e7d9cc4122771cb73fdcf4d7e212007959b37fb..802fdcf94b8ee1bc3262484864fb09116a868213 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -20,4 +20,6 @@ $wb['dkim_settings_txt'] = 'DomainKeys Tanımlı E-posta (DKIM)';
 $wb['error_not_allowed_server_id'] = 'Seçilmiş sunucuda bu hesap kullanılamaz.';
 $wb['dkim_selector_txt'] = 'DKIM Seçici';
 $wb['dkim_selector_error'] = 'DKIM seçici geçersiz. En fazla 63 karakter uzunluğunda, yalnız küçük İngilizce harf ve rakamları kullanın (a-z ya da 0-9)';
-?>
+$wb['relayhost_txt'] = 'Relayhost';
+$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_password_txt'] = 'Relayhost Password';
diff --git a/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
index bcdf6298469c4abae5b2785636387d18a12f73cd..1cb732b58bc83a6b7d72e8f6c3f03cdb98442486 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
@@ -9,4 +9,5 @@ $wb['limit_mailcatchall_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla tümü
 $wb['domain_txt'] = 'Etki Alanı';
 $wb['source_txt'] = 'Kaynak';
 $wb['destination_error_isemail'] = 'Hedef e-posta adresi geçersiz.';
-?>
+$wb['send_as_txt'] = 'Gönderen';
+$wb['send_as_exp'] = 'Allow destination to send from email addresses in this domain';
diff --git a/interface/web/mail/lib/lang/tr_mail_whitelist.lng b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
index c6272a9ede18c272efb8036cc8b7022ffebec0f4..8159b11eddbb3074ba5695407400df31e8c4404f 100644
--- a/interface/web/mail/lib/lang/tr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/tr_mail_whitelist.lng
@@ -6,4 +6,7 @@ $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.';
+$wb['mail_access_unique'] = 'Whitelist Address already in use.';
+$wb['client_txt'] = 'Client';
+$wb['sender_txt'] = 'Sender';
diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index d9d97bc8b2fb72c4b161791023177368f901000e..fbe8ffbcb5785e4737d676034edd5cba0d9cc13d 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -61,6 +61,20 @@ if($app->auth->get_client_limit($userid, 'mailcatchall') != 0)
 		'html_id' => 'mail_domain_catchall_list');
 }
 
+if(! $app->auth->is_admin())
+{
+	$items[] = array(   'title'  => 'Email Whitelist',
+		'target'  => 'content',
+		'link'     => 'mail/mail_whitelist_list.php',
+		'html_id' => 'mail_whitelist_list');
+
+
+	$items[] = array(   'title'  => 'Email Blacklist',
+		'target'  => 'content',
+		'link'     => 'mail/mail_blacklist_list.php',
+		'html_id' => 'mail_blacklist_list');
+}
+
 if($app->auth->get_client_limit($userid, 'mailrouting') != 0)
 {
 	$items[] = array( 'title'  => 'Email Routing',
@@ -110,8 +124,8 @@ if($app->auth->get_client_limit($userid, 'spamfilter_wblist') != 0)
 		'html_id' => 'spamfilter_blacklist_list');
 }
 
-if($app->auth->is_admin()) {
-
+if($app->auth->is_admin())
+{
 	$items[] = array(  'title'  => 'User / Domain',
 		'target'  => 'content',
 		'link'     => 'mail/spamfilter_users_list.php',
@@ -191,7 +205,9 @@ $items[] = array( 'title'  => 'Mailbox traffic',
 	'target'  => 'content',
 	'link' => 'mail/mail_user_stats.php',
 	'html_id' => 'mail_user_stats');
-if($app->auth->get_client_limit($userid, 'backup') == 'y') {
+
+if($app->auth->get_client_limit($userid, 'backup') == 'y')
+{
         $items[] = array (
             'title'   => 'Backup Stats',
             'target'  => 'content',
@@ -206,8 +222,8 @@ $module['nav'][] = array( 'title' => 'Statistics',
 
 //**** Global filters menu
 $items = array();
-if($_SESSION['s']['user']['typ'] == 'admin') {
-
+if($app->auth->is_admin())
+{
 	$items[] = array(   'title'  => 'Postfix Whitelist',
 		'target'  => 'content',
 		'link'     => 'mail/mail_whitelist_list.php',
diff --git a/interface/web/mail/list/mail_blacklist.list.php b/interface/web/mail/list/mail_blacklist.list.php
index a2f3997fd7aaa5c080c8d1072aca29030c08659f..d51f31a7d83142f83e656bdee001ba3f9c4ae67c 100644
--- a/interface/web/mail/list/mail_blacklist.list.php
+++ b/interface/web/mail/list/mail_blacklist.list.php
@@ -78,10 +78,20 @@ $liste["item"][] = array( 'field'  => "source",
 	'op'  => "like",
 	'prefix' => "%",
 	'suffix' => "%",
+	'datasource' => array (  'type' => 'SQL',
+		'querystring' => 'SELECT access_id,source FROM mail_access WHERE {AUTHSQL} ORDER BY source',
+		'keyfield'=> 'access_id',
+		'valuefield'=> 'source'
+	),
 	'width'  => "",
 	'value'  => "");
 
 
+if ($app->auth->is_admin()) {
+	$type_values = array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client');
+} else {
+	$type_values = array('recipient' => 'Recipient', 'sender' => 'Sender');
+}
 $liste["item"][] = array( 'field'  => "type",
 	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
@@ -89,7 +99,6 @@ $liste["item"][] = array( 'field'  => "type",
 	'prefix' => "",
 	'suffix' => "",
 	'width'  => "",
-	'value'  => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client'));
-
+	'value'  => $type_values);
 
 ?>
diff --git a/interface/web/mail/list/mail_whitelist.list.php b/interface/web/mail/list/mail_whitelist.list.php
index e27edad6dabee79f085dc64b67a96eabad31723c..b4c97f493ffd3388f278891618cbcce5496c16ca 100644
--- a/interface/web/mail/list/mail_whitelist.list.php
+++ b/interface/web/mail/list/mail_whitelist.list.php
@@ -78,9 +78,20 @@ $liste["item"][] = array( 'field'  => "source",
 	'op'  => "like",
 	'prefix' => "%",
 	'suffix' => "%",
+	'datasource' => array (  'type' => 'SQL',
+		'querystring' => 'SELECT access_id,source FROM mail_access WHERE {AUTHSQL} ORDER BY source',
+		'keyfield'=> 'access_id',
+		'valuefield'=> 'source'
+	),
 	'width'  => "",
 	'value'  => "");
 
+
+if ($app->auth->is_admin()) {
+	$type_values = array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client');
+} else {
+	$type_values = array('recipient' => 'Recipient', 'sender' => 'Sender');
+}
 $liste["item"][] = array( 'field'  => "type",
 	'datatype' => "VARCHAR",
 	'formtype' => "SELECT",
@@ -88,7 +99,6 @@ $liste["item"][] = array( 'field'  => "type",
 	'prefix' => "",
 	'suffix' => "",
 	'width'  => "",
-	'value'  => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt'));
-
+	'value'  => $type_values);
 
 ?>
diff --git a/interface/web/mail/mail_blacklist_del.php b/interface/web/mail/mail_blacklist_del.php
index aa671c488714f0f76af47e45aafad673ecb32eca..3cb83a50a00dcc3859335bc5f7e3df4546c1994b 100644
--- a/interface/web/mail/mail_blacklist_del.php
+++ b/interface/web/mail/mail_blacklist_del.php
@@ -42,9 +42,6 @@ $tform_def_file = "form/mail_blacklist.tform.php";
 require_once '../../lib/config.inc.php';
 require_once '../../lib/app.inc.php';
 
-
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
-
 //* Check permissions for module
 $app->auth->check_module_permissions('mail');
 
diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php
index b86729b919e9d08a8855d972d8c447e48a36bc3b..e1cb2de66b1f6346730be53bb2d13dda22fb7b71 100644
--- a/interface/web/mail/mail_blacklist_edit.php
+++ b/interface/web/mail/mail_blacklist_edit.php
@@ -50,39 +50,82 @@ $app->load('tform_actions');
 
 class page_action extends tform_actions {
 
+	protected $client_allowed_types = array( 'recipient', 'sender' );
+
 	function onShowNew() {
-		global $app, $conf;
+		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"]);
+			}
+		}
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
 		parent::onShowNew();
 	}
 
-
 	function onBeforeUpdate() {
 		global $app, $conf;
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
-
 		//* Check if the server has been changed
-		// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
-		if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-			$rec = $app->db->queryOneRecord("SELECT server_id from mail_access WHERE access_id = ?", $this->id);
-			if($rec['server_id'] != $this->dataRecord["server_id"]) {
-				//* Add a error message and switch back to old server
-				$app->tform->errorMessage .= $app->lng('The Server can not be changed.');
-				$this->dataRecord["server_id"] = $rec['server_id'];
-			}
-			unset($rec);
+		$rec = $app->db->queryOneRecord("SELECT server_id from mail_access WHERE access_id = ?", $this->id);
+		if($rec['server_id'] != $this->dataRecord["server_id"]) {
+			//* Add a error message and switch back to old server
+			$app->tform->errorMessage .= $app->lng('The Server can not be changed.');
+			$this->dataRecord["server_id"] = $rec['server_id'];
 		}
+		unset($rec);
 	}
 
 	function onSubmit() {
 		global $app, $conf;
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
-		
+		// Non-admin checks
+		if($_SESSION["s"]["user"]["typ"] != 'admin') {
+			// 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
+			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);
+			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);
-		
+
+		$rec = $app->db->queryOneRecord("SELECT access_id from mail_access WHERE server_id = ? AND source = ? and type = ?", $this->dataRecord["server_id"], $this->dataRecord["source"], $this->dataRecord["type"]);
+		if(is_array($rec) && isset($rec['access_id'])) {
+			$app->tform->errorMessage .= $app->tform->wordbook["mail_access_unique"]."<br>";
+		}
+		unset($rec);
+
 		parent::onSubmit();
 	}
 
@@ -91,5 +134,4 @@ class page_action extends tform_actions {
 $app->tform_actions = new page_action;
 $app->tform_actions->onLoad();
 
-
 ?>
diff --git a/interface/web/mail/mail_blacklist_list.php b/interface/web/mail/mail_blacklist_list.php
index ecb24d867c740f2f7853fd46d4d7f52ed1a5bf6b..cf1e50ddaaf5a319cc605f1376ac47d0e6921a4a 100644
--- a/interface/web/mail/mail_blacklist_list.php
+++ b/interface/web/mail/mail_blacklist_list.php
@@ -12,8 +12,6 @@ $list_def_file = "list/mail_blacklist.list.php";
 * End Form configuration
 ******************************************/
 
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
-
 //* Check permissions for module
 $app->auth->check_module_permissions('mail');
 
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 7409bf0c7c42136595dad22c1abafc07fa1c4399..3ea60c08f92b9de4f2fab257cbfa43811e92b540 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -215,6 +215,13 @@ class page_action extends tform_actions {
 			$app->tpl->setVar("edit_disabled", 0);
 		}
 
+		// load relayhost-values
+		$sql = "SELECT relay_host, relay_user, relay_pass FROM mail_domain WHERE domain_id = ?";
+		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
+		$app->tpl->setVar('relay_host', $rec['relay_host'], true);
+		$app->tpl->setVar('relay_user', $rec['relay_user'], true);
+		$app->tpl->setVar('relay_pass', $rec['relay_pass'], true);
+
 		// load dkim-values
 		$sql = "SELECT domain, dkim_private, dkim_public, dkim_selector FROM mail_domain WHERE domain_id = ?";
 		$rec = $app->db->queryOneRecord($sql, $app->functions->intval($_GET['id']));
diff --git a/interface/web/mail/mail_whitelist_del.php b/interface/web/mail/mail_whitelist_del.php
index 06ce88550bcef2a2e00d674759ddf310842bba3a..94be228f67035481bbfc4dd24057b325ce8a8445 100644
--- a/interface/web/mail/mail_whitelist_del.php
+++ b/interface/web/mail/mail_whitelist_del.php
@@ -42,8 +42,6 @@ $tform_def_file = "form/mail_whitelist.tform.php";
 require_once '../../lib/config.inc.php';
 require_once '../../lib/app.inc.php';
 
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
-
 //* Check permissions for module
 $app->auth->check_module_permissions('mail');
 
diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php
index 35fa825ec78cbdb8d237594cd276ae94ce9199b2..81a5d1527439a111f7cf500e6ec366de75f49633 100644
--- a/interface/web/mail/mail_whitelist_edit.php
+++ b/interface/web/mail/mail_whitelist_edit.php
@@ -50,21 +50,27 @@ $app->load('tform_actions');
 
 class page_action extends tform_actions {
 
+	protected $client_allowed_types = array( 'recipient', 'sender' );
+
 	function onShowNew() {
-		global $app, $conf;
+		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"]);
+			}
+		}
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
-		
 		parent::onShowNew();
 	}
 
 	function onBeforeUpdate() {
 		global $app, $conf;
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
-		
 		//* Check if the server has been changed
-		// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
 		$rec = $app->db->queryOneRecord("SELECT server_id from mail_access WHERE access_id = ?", $this->id);
 		if($rec['server_id'] != $this->dataRecord["server_id"]) {
 			//* Add a error message and switch back to old server
@@ -77,10 +83,49 @@ class page_action extends tform_actions {
 	function onSubmit() {
 		global $app, $conf;
 
-		if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
+		// Non-admin checks
+		if($_SESSION["s"]["user"]["typ"] != 'admin') {
+			// 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
+			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);
+			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);
 
+		$rec = $app->db->queryOneRecord("SELECT access_id from mail_access WHERE server_id = ? AND source = ? and type = ?", $this->dataRecord["server_id"], $this->dataRecord["source"], $this->dataRecord["type"]);
+		if(is_array($rec) && isset($rec['access_id'])) {
+			$app->tform->errorMessage .= $app->tform->wordbook["mail_access_unique"]."<br>";
+		}
+		unset($rec);
+
 		parent::onSubmit();
 	}
 
@@ -89,5 +134,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_list.php b/interface/web/mail/mail_whitelist_list.php
index 73877797b4c97e40a333427c4e606793d70e2651..4fd33dd977b0259f46c83c2f2634ff787a9f7910 100644
--- a/interface/web/mail/mail_whitelist_list.php
+++ b/interface/web/mail/mail_whitelist_list.php
@@ -12,8 +12,6 @@ $list_def_file = "list/mail_whitelist.list.php";
 * End Form configuration
 ******************************************/
 
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
-
 //* Check permissions for module
 $app->auth->check_module_permissions('mail');
 
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 2fd149a348351667536af5e57fa0a67081524bbd..7cd50b7d6fdd66a40da9bd3d2e382f1225f5d445 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -17,21 +17,21 @@
                 </select></div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='active'}
+                    {tmpl_var name='allow_send_as'} <small> {tmpl_var name='send_as_exp'}</small>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='allow_send_as'} <small>{tmpl_var name='send_as_exp'}</small>
+                    {tmpl_var name='greylisting'}
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='greylisting'}
+                    {tmpl_var name='active'}
                 </div>
             </div>
 
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 8da10f1f09e00e5a8840f3c8feed993b224108d1..f42781c62f8c406748d65a2a657b6343e7b41ade 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -10,6 +10,12 @@
             <div class="form-group">
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
                 <div class="col-sm-9"><input type="text" name="destination" id="destination" value="{tmpl_var name='destination'}" class="form-control" /></div></div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
+                <div class="col-sm-9">
+                    {tmpl_var name='allow_send_as'} <small> {tmpl_var name='send_as_exp'}</small>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index cb462c98196dac2052ffcce13d9679fdba26e6d8..676e55f9dcc3b102f7f9ec61424d9cef551f8e02 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -75,6 +75,24 @@
                     {tmpl_var name='policy'}
                 </select></div>
             </div>
+            <div class="form-group">
+                <label for="relay_host" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
+                <div class="col-sm-9">
+                    <input type="text" name="relay_host" id="relay_host" value="{tmpl_var name='relay_host'}" class="form-control" />
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="relay_user" class="col-sm-3 control-label">{tmpl_var name='relayhost_user_txt'}</label>
+                <div class="col-sm-9">
+                    <input type="text" name="relay_user" id="relay_user" value="{tmpl_var name='relay_user'}" class="form-control" />
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="relay_pass" class="col-sm-3 control-label">{tmpl_var name='relayhost_password_txt'}</label>
+                <div class="col-sm-9">
+                    <input type="text" name="relay_pass" id="relay_pass" value="{tmpl_var name='relay_pass'}" class="form-control" />
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
index 128ad4cd7507ef820cd2b092db74e3f3d2180d02..908156f31ff81abe2eeaf2725b13f7bccb993da5 100644
--- a/interface/web/mail/templates/mail_forward_edit.htm
+++ b/interface/web/mail/templates/mail_forward_edit.htm
@@ -15,21 +15,21 @@
                 <div class="col-sm-9"><textarea rows="10" cols="40" name="destination" id="destination" class="form-control">{tmpl_var name='destination'}</textarea></div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='active'}
+                    {tmpl_var name='allow_send_as'} <small> {tmpl_var name='send_as_exp'}</small>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='allow_send_as'} <small>{tmpl_var name='send_as_exp'}</small>
+                    {tmpl_var name='greylisting'}
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+                <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">
-                    {tmpl_var name='greylisting'}
+                    {tmpl_var name='active'}
                 </div>
             </div>
 
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,
diff --git a/security/README.txt b/security/README.txt
index b42cbaabb4adb2c698506c7c7abb1ecd22debc52..1825b981f2796bbdbbab6b81c4e984771fb32673 100644
--- a/security/README.txt
+++ b/security/README.txt
@@ -1,7 +1,7 @@
 
 Description for security_settings.ini values.
 
-The option "superadmin" means that a setting is only available to the admin user with userid 1 in the interface. 
+The option "superadmin" means that a setting is only available to the admin user with userid 1 in the interface.
 If there are other amdins, then they cant access this setting.
 
 -----------------------------------------------------------
@@ -57,14 +57,6 @@ Setting:     admin_allow_osupdate
 Options:     yes/no/superadmin
 Description: Disables System > OS update
 
-Setting:     admin_allow_software_packages
-Options:     yes/no/superadmin
-Description: Disables System > Apps & Addons > Packages and Update
-
-Setting:     admin_allow_software_repo
-Options:     yes/no/superadmin
-Description: Disables System > Apps & Addons > Repo
-
 Setting:     remote_api_allowed
 Options:     yes/no
 Description: Disables the remote API
@@ -80,13 +72,13 @@ Description: Enables the Intrusion Detection System
 Setting:     ids_log_level
 Options:     1 (number, default = 1)
 Description: IDS score that triggers the log in /usr/local/ispconfig/interface/temp/ids.log
-             This log can be used to feed the whitelist. 
-			 
+             This log can be used to feed the whitelist.
+
 			 Example:
-			 
+
 			 cat /usr/local/ispconfig/interface/temp/ids.log >> /usr/local/ispconfig/security/ids.whitelist
 			 rm -f /usr/local/ispconfig/interface/temp/ids.log
-			 
+
 			 If you want to use a custom whitelist, then store it as /usr/local/ispconfig/security/ids.whitelist.custom
 
 Setting:     ids_warn_level
@@ -95,7 +87,7 @@ Description: When the IDS score exceeds this level, a error message is logged in
 
 Setting:     ids_block_level
 Options:     100 (number, default = 100)
-Description: When the IDS score exceeds this level, a error message is shown to the user and further processing is blocked. A score of 100 will most likely never be reached. 
+Description: When the IDS score exceeds this level, a error message is shown to the user and further processing is blocked. A score of 100 will most likely never be reached.
              We have choosen such a high score as default until we have more complete whitelists for this new feature.
 
 Setting:     sql_scan_enabled
@@ -135,5 +127,3 @@ Description: Warn by email when /etc/shadow has been changed.
 Setting:     warn_group_change
 Options:     yes/no
 Description: Warn by email when /etc/group has been changed.
-
-
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index f2b3e0f8338fc5d520dd5ce975e32d4131bfec9c..d5e457b9e33e3da4313a8260fa4ce58264468d13 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -15,7 +15,7 @@ server {
         listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl http2;
 <tmpl_if name='use_proxy_protocol' op='==' value='y'>
 <tmpl_if name='proxy_protocol_https' op='>' value='0'>
-        listen <tmpl_var name='ip_address'>:<tmpl_var name='proxy_protocol_https'> ssl proxy_protocol;
+        listen <tmpl_var name='ip_address'>:<tmpl_var name='proxy_protocol_https'> ssl http2 proxy_protocol;
 </tmpl_if>
 </tmpl_if>
 
@@ -79,7 +79,7 @@ server {
 </tmpl_if>
 </tmpl_loop>
 <tmpl_if name='use_proxy' op='!=' value='y'>
-        index index.html index.htm index.php index.cgi index.pl index.xhtml;
+        index index.html index.htm index.php index.cgi index.pl index.xhtml standard_index.html;
 
 <tmpl_if name='ssi' op='==' value='y'>
         location ~ \.shtml$ {
diff --git a/server/conf/rspamd_users.inc.conf.master b/server/conf/rspamd_users.inc.conf.master
index 96ba9f08384f0c42fa398517f4e34ff301c83648..83dd5b27643143a94340d49a7c913ed191840ae3 100644
--- a/server/conf/rspamd_users.inc.conf.master
+++ b/server/conf/rspamd_users.inc.conf.master
@@ -38,9 +38,11 @@
 		actions {
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='rewrite_subject'>
 			"rewrite subject" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"add header" = null;
 		</tmpl_if>
 		<tmpl_if name='rspamd_spam_tag_method' op='==' value='add_header'>
 			"add header" =  <tmpl_var name='rspamd_spam_tag_level'>;
+			"rewrite subject" = null;
 		</tmpl_if>
 			reject = <tmpl_var name='rspamd_spam_kill_level'>;
 	<tmpl_if name='greylisting'>
diff --git a/server/lib/classes/cron.d/600-jailkit_maintenance.inc.php b/server/lib/classes/cron.d/600-jailkit_maintenance.inc.php
index 547b7caa1a2107941aa0fa2aeda195e3174e6d55..4ef5835e67c1ae6a74ddc1f48b2d6ef4d502b8e0 100644
--- a/server/lib/classes/cron.d/600-jailkit_maintenance.inc.php
+++ b/server/lib/classes/cron.d/600-jailkit_maintenance.inc.php
@@ -114,7 +114,8 @@ class cronjob_jailkit_maintenance extends cronjob {
 				if (is_file( $rec['document_root']."/bin/bash" )) {
 					# test that /bin/bash functions in the jail
 print "chroot --userspec ".$rec['system_user'].":".$rec['system_group']." ".$rec['document_root']." /bin/bash -c true 2>/dev/null\n";
-					if (! $app->system->exec_safe("chroot --userspec ?:? ? /bin/bash -c true 2>/dev/null", $rec['system_user'], $rec['system_group'], $rec['document_root'])) {
+					$app->system->exec_safe("chroot --userspec ?:? ? /bin/bash -c true 2>/dev/null", $rec['system_user'], $rec['system_group'], $rec['document_root']);
+					if ($app->system->last_exec_retcode()) {  # return 0 means success
 print "/bin/bash test failed, forcing update\n";
 						$options[] = 'force';
 						# bogus hash will not match, triggering an update
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
index a118d55769941f386311885cfecc86c02f903de4..a2e6a5c380144ecc864259b5dc149169eff4d10d 100644
--- a/server/lib/classes/letsencrypt.inc.php
+++ b/server/lib/classes/letsencrypt.inc.php
@@ -317,8 +317,15 @@ class letsencrypt {
 		if($this->get_acme_script()) {
 			$use_acme = true;
 		} elseif(!$this->get_certbot_script()) {
+			$app->log("Unable to find Let's Encrypt client, installing acme.sh.", LOGLEVEL_DEBUG);
 			// acme and le missing
 			$this->install_acme();
+			if($this->get_acme_script()) {
+				$use_acme = true;
+			} else {
+				$app->log("Unable to install acme.sh.  Cannot proceed, no Let's Encrypt client found.", LOGLEVEL_WARN);
+				return false;
+			}
 		}
 
 		$tmp = $app->letsencrypt->get_website_certificate_paths($data);
@@ -399,11 +406,13 @@ class letsencrypt {
 		$this->certbot_use_certcommand = false;
 		$letsencrypt_cmd = '';
 		$allow_return_codes = null;
+		$old_umask = umask(0022);  # work around acme.sh permission bug, see #6015
 		if($use_acme) {
 			$letsencrypt_cmd = $this->get_acme_command($temp_domains, $key_file, $bundle_file, $crt_file, $server_type);
 			$allow_return_codes = array(2);
 		} else {
 			$letsencrypt_cmd = $this->get_certbot_command($temp_domains);
+			umask($old_umask);
 		}
 
 		$success = false;
@@ -420,6 +429,7 @@ class letsencrypt {
 		}
 
 		if($use_acme === true) {
+			umask($old_umask);
 			if(!$success) {
 				$app->log('Let\'s Encrypt SSL Cert for: ' . $domain . ' could not be issued.', LOGLEVEL_WARN);
 				$app->log($letsencrypt_cmd, LOGLEVEL_WARN);
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index a26707b0aea1a76258773b8f8902e34b66112d76..5a99bbda20f1d8438cb13d8bae4aff434b5ad4fa 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -2412,6 +2412,7 @@ class system{
 
 	public function create_jailkit_chroot($home_dir, $app_sections = array(), $options = array()) {
 		global $app;
+$app->log("create_jailkit_chroot: called for home_dir $home_dir with options: " . print_r($options, true), LOGLEVEL_DEBUG);
 
 		// Disallow operating on root directory
 		if(realpath($home_dir) == '/') {
@@ -2428,6 +2429,9 @@ class system{
 		} elseif(is_string($app_sections)) {
 			$app_sections = preg_split('/[\s,]+/', $app_sections);
 		}
+		if(! is_array($options)) {
+			$options = (is_string($options) ? preg_split('/[\s,]+/', $options) : array());
+		}
 
 		// Change ownership of the chroot directory to root
 		$this->chown($home_dir, 'root');
@@ -2485,6 +2489,7 @@ class system{
 
 	public function create_jailkit_programs($home_dir, $programs = array(), $options = array()) {
 		global $app;
+$app->log("create_jailkit_programs: called for home_dir $home_dir with options: " . print_r($options, true), LOGLEVEL_DEBUG);
 
 		// Disallow operating on root directory
 		if(realpath($home_dir) == '/') {
@@ -2501,6 +2506,9 @@ class system{
 		} elseif(is_string($programs)) {
 			$programs = preg_split('/[\s,]+/', $programs);
 		}
+		if(! is_array($options)) {
+			$options = (is_string($options) ? preg_split('/[\s,]+/', $options) : array());
+		}
 
 		# prohibit ill-advised copying paths known to be sensitive/problematic
 		# (easy to bypass if needed, eg. use /./etc)
diff --git a/server/mods-available/server_module.inc.php b/server/mods-available/server_module.inc.php
index bc846cf53062b0cec4fc653095a00ecace34f6a1..92a50c51286b32f092150568d6cc69bfc0c4f845 100644
--- a/server/mods-available/server_module.inc.php
+++ b/server/mods-available/server_module.inc.php
@@ -40,10 +40,7 @@ class server_module {
 		'server_ip_delete',
 		'firewall_insert',
 		'firewall_update',
-		'firewall_delete',
-		'software_update_inst_insert',
-		'software_update_inst_update',
-		'software_update_inst_delete');
+		'firewall_delete');
 
 	//* This function is called during ispconfig installation to determine
 	//  if a symlink shall be created for this plugin.
@@ -81,7 +78,6 @@ class server_module {
 		$app->modules->registerTableHook('server', 'server_module', 'process');
 		$app->modules->registerTableHook('server_ip', 'server_module', 'process');
 		$app->modules->registerTableHook('firewall', 'server_module', 'process');
-		$app->modules->registerTableHook('software_update_inst', 'server_module', 'process');
 
 		// Register service
 		//$app->services->registerService('httpd','web_module','restartHttpd');
@@ -112,11 +108,6 @@ class server_module {
 			if($action == 'u') $app->plugins->raiseEvent('firewall_update', $data);
 			if($action == 'd') $app->plugins->raiseEvent('firewall_delete', $data);
 			break;
-		case 'software_update_inst':
-			if($action == 'i') $app->plugins->raiseEvent('software_update_inst_insert', $data);
-			if($action == 'u') $app->plugins->raiseEvent('software_update_inst_update', $data);
-			if($action == 'd') $app->plugins->raiseEvent('software_update_inst_delete', $data);
-			break;
 		} // end switch
 	} // end function
 
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 26cd14fd3629e2b7c7aec70d6ef550ad2fc1ffe8..170f8b1b72f9c4c2a52a3f53b06d24a952a5bef3 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -788,17 +788,18 @@ class apache2_plugin {
 		$last_updated = array_unique($last_updated, SORT_REGULAR);
 		sort($last_updated, SORT_STRING);
 		$update_hash = hash('md5', implode(' ', $last_updated));
+		$check_for_jailkit_updates=false;
 
 		// Create jailkit chroot when enabling php_fpm_chroot
-		if($data['new']['php_fpm_chroot'] == 'y' && $data['old']['php_fpm_chroot'] != 'y') {
+		if($data['new']['php_fpm_chroot'] == 'y' && $data['old']['php_fpm_chroot'] != 'y' && $data['new']['php'] != 'no') {
 			$website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = ?', $data['new']['domain_id']);
 			$this->website = array_merge($website, $data['new'], array('new_jailkit_hash' => $update_hash));
 			$this->jailkit_config = $jailkit_config;
 			$this->_setup_jailkit_chroot();
 			$this->_add_jailkit_user();
-			$check_for_jailkit_updates=false;
 		// else delete if unused
-		} elseif ($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php_fpm_chroot'] != 'y') {
+		} elseif (($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php_fpm_chroot'] != 'y') ||
+			($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php'] == 'no')) {
 			$check_for_jailkit_updates=false;
 			$this->_delete_jailkit_if_unused($data['new']['domain_id']);
 			if(is_dir($data['new']['document_root'].'/etc/jailkit')) {
@@ -953,11 +954,11 @@ class apache2_plugin {
 				$app->system->exec_safe('chmod -R a+r ?', $error_page_path);
 			}
 
-			//* Copy the web skeleton files only when there is no index.ph or index.html file yet
-			if(!file_exists($data['new']['document_root'].'/'.$web_folder.'/index.html') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/index.php')) {
+			//* Copy the web skeleton files only when there is no index.php, standard_index.html or index.html file yet
+			if(!file_exists($data['new']['document_root'].'/'.$web_folder.'/index.html') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/index.php') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/standard_index.html')) {
 				if (file_exists($conf['rootpath'] . '/conf-custom/index/standard_index.html_'.substr($conf['language'], 0, 2))) {
-					if(!file_exists($data['new']['document_root'] . '/' . $web_folder . '/index.html')) {
-						$app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html_' . substr($conf['language'], 0, 2), $data['new']['document_root'] . '/' . $web_folder . '/index.html');
+					if(!file_exists($data['new']['document_root'] . '/' . $web_folder . '/standard_index.html')) {
+						$app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html_' . substr($conf['language'], 0, 2), $data['new']['document_root'] . '/' . $web_folder . '/standard_index.html');
 					}
 
 					if(is_file($conf['rootpath'] . '/conf-custom/index/favicon.ico')) {
@@ -968,13 +969,13 @@ class apache2_plugin {
 					}
 				} else {
 					if (file_exists($conf['rootpath'] . '/conf-custom/index/standard_index.html')) {
-						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html', $data['new']['document_root'].'/' . $web_folder . '/index.html');
+						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/standard_index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html', $data['new']['document_root'].'/' . $web_folder . '/standard_index.html');
 					} else {
-						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/standard_index.html_'.substr($conf['language'], 0, 2), $data['new']['document_root'].'/' . $web_folder . '/index.html');
-						if(is_file($conf['rootpath'] . '/conf/index/favicon.ico')){
+						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/standard_index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/standard_index.html_'.substr($conf['language'], 0, 2), $data['new']['document_root'].'/' . $web_folder . '/standard_index.html');
+						if(is_file($conf['rootpath'] . '/conf/index/favicon.ico')) {
 							if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/favicon.ico')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/favicon.ico', $data['new']['document_root'].'/' . $web_folder . '/');
 						}
-						if(is_file($conf['rootpath'] . '/conf/index/robots.txt')){
+						if(is_file($conf['rootpath'] . '/conf/index/robots.txt')) {
 							if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/robots.txt')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/robots.txt', $data['new']['document_root'].'/' . $web_folder . '/');
 						}
 					}
@@ -3820,7 +3821,7 @@ class apache2_plugin {
 		}
 
 		// chroot is used by php-fpm
-		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y') {
+		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y' && $parent_domain['php'] != 'no') {
 			return;
 		}
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 73e788ed436d2c50cc8be7a7f0122b80793571e7..bec59fddc40f38525cb7f6d35ab982f8c4b7a053 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -626,17 +626,18 @@ class nginx_plugin {
 		$last_updated = array_unique($last_updated, SORT_REGULAR);
 		sort($last_updated, SORT_STRING);
 		$update_hash = hash('md5', implode(' ', $last_updated));
+		$check_for_jailkit_updates=false;
 
 		// Create jailkit chroot when enabling php_fpm_chroot
-		if($data['new']['php_fpm_chroot'] == 'y' && $data['old']['php_fpm_chroot'] != 'y') {
+		if($data['new']['php_fpm_chroot'] == 'y' && $data['old']['php_fpm_chroot'] != 'y' && $data['new']['php'] != 'no') {
 			$website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = ?', $data['new']['domain_id']);
 			$this->website = array_merge($website, $data['new'], array('new_jailkit_hash' => $update_hash));
 			$this->jailkit_config = $jailkit_config;
 			$this->_setup_jailkit_chroot();
 			$this->_add_jailkit_user();
-			$check_for_jailkit_updates=false;
 		// else delete if unused
-		} elseif ($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php_fpm_chroot'] != 'y') {
+		} elseif (($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php_fpm_chroot'] != 'y') ||
+			($data['new']['delete_unused_jailkit'] == 'y' && $data['new']['php'] == 'no')) {
 			$check_for_jailkit_updates=false;
 			$this->_delete_jailkit_if_unused($data['new']['domain_id']);
 			if(is_dir($data['new']['document_root'].'/etc/jailkit')) {
@@ -791,10 +792,12 @@ class nginx_plugin {
 				$app->system->exec_safe('chmod -R a+r ?', $error_page_path);
 			}
 
-			//* Copy the web skeleton files only when there is no index.ph or index.html file yet
-			if(!file_exists($data['new']['document_root'].'/'.$web_folder.'/index.html') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/index.php')) {
+			//* Copy the web skeleton files only when there is no index.php, standard_index.html or index.html file yet
+			if(!file_exists($data['new']['document_root'].'/'.$web_folder.'/index.html') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/index.php') && !file_exists($data['new']['document_root'].'/'.$web_folder.'/standard_index.html')) {
 				if (file_exists($conf['rootpath'] . '/conf-custom/index/standard_index.html_'.substr($conf['language'], 0, 2))) {
-					if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html_'.substr($conf['language'], 0, 2), $data['new']['document_root'].'/' . $web_folder . '/index.html');
+					if(!file_exists($data['new']['document_root'] . '/' . $web_folder . '/standard_index.html')) {
+						$app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html_' . substr($conf['language'], 0, 2), $data['new']['document_root'] . '/' . $web_folder . '/standard_index.html');
+					}
 
 					if(is_file($conf['rootpath'] . '/conf-custom/index/favicon.ico')) {
 						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/favicon.ico')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/favicon.ico', $data['new']['document_root'].'/' . $web_folder . '/');
@@ -804,13 +807,13 @@ class nginx_plugin {
 					}
 				} else {
 					if (file_exists($conf['rootpath'] . '/conf-custom/index/standard_index.html')) {
-						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html', $data['new']['document_root'].'/' . $web_folder . '/index.html');
+						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/standard_index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf-custom/index/standard_index.html', $data['new']['document_root'].'/' . $web_folder . '/standard_index.html');
 					} else {
-						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/standard_index.html_'.substr($conf['language'], 0, 2), $data['new']['document_root'].'/' . $web_folder . '/index.html');
-						if(is_file($conf['rootpath'] . '/conf/index/favicon.ico')){
+						if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/standard_index.html')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/standard_index.html_'.substr($conf['language'], 0, 2), $data['new']['document_root'].'/' . $web_folder . '/standard_index.html');
+						if(is_file($conf['rootpath'] . '/conf/index/favicon.ico')) {
 							if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/favicon.ico')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/favicon.ico', $data['new']['document_root'].'/' . $web_folder . '/');
 						}
-						if(is_file($conf['rootpath'] . '/conf/index/robots.txt')){
+						if(is_file($conf['rootpath'] . '/conf/index/robots.txt')) {
 							if(!file_exists($data['new']['document_root'].'/' . $web_folder . '/robots.txt')) $app->system->exec_safe('cp ? ?', $conf['rootpath'] . '/conf/index/robots.txt', $data['new']['document_root'].'/' . $web_folder . '/');
 						}
 					}
@@ -3597,7 +3600,7 @@ class nginx_plugin {
 		}
 
 		// chroot is used by php-fpm
-		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y') {
+		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y' && $parent_domain['php'] != 'no') {
 			return;
 		}
 
diff --git a/server/plugins-available/openvz_plugin.inc.php b/server/plugins-available/openvz_plugin.inc.php
index f17edb7b8c1882844b26eb6afb147eba9416075f..4be9c30ebf9b8c9daef2374928a1374d24f4ab8f 100644
--- a/server/plugins-available/openvz_plugin.inc.php
+++ b/server/plugins-available/openvz_plugin.inc.php
@@ -123,7 +123,7 @@ class openvz_plugin {
 
 		//* new diskspace for ploop-containers requieres "vzctl set"
 		if($data['new']['diskspace'] != $data['old']['diskspace']) {
-			escapeshell("vzctl set ? --diskspace ? --save", $veid, $data['new']['diskspace']."G");
+			$app->system->exec_safe("vzctl set ? --diskspace ? --save", $veid, $data['new']['diskspace']."G");
 		}
 
 		//* Apply config changes to the VM
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index b3e453be555427a5b8845dad5bf3bda347bb112f..8cdb95066bde7cf78a085f9020c62e6dd2e13be0 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -159,11 +159,18 @@ class postfix_server_plugin {
 			}
 
 			if ($mail_config['reject_sender_login_mismatch'] == 'y') {
-				array_splice($new_options, 0, 0, array('reject_authenticated_sender_login_mismatch'));
-
+				// insert before permit_mynetworks
 				for ($i = 0; isset($new_options[$i]); $i++) {
 					if ($new_options[$i] == 'permit_mynetworks') {
-						array_splice($new_options, $i+1, 0, array('reject_sender_login_mismatch'));
+						array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+						break;
+					}
+				}
+
+				// insert before permit_sasl_authenticated
+				for ($i = 0; isset($new_options[$i]); $i++) {
+					if ($new_options[$i] == 'permit_sasl_authenticated') {
+						array_splice($new_options, $i, 0, array('reject_sender_login_mismatch'));
 						break;
 					}
 				}
@@ -358,7 +365,8 @@ class postfix_server_plugin {
 				exec("postconf -e 'milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}'");
 				exec("postconf -e 'milter_default_action = accept'");
 
-				exec("postconf -e 'smtpd_sender_restrictions = ${raslm} permit_mynetworks, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf'");
+				exec("postconf -e 'smtpd_sender_restrictions = ${raslm} permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender'");
+
 
 				$new_options = array();
 				$options = preg_split("/,\s*/", exec("postconf -h smtpd_recipient_restrictions"));
@@ -397,7 +405,7 @@ class postfix_server_plugin {
 				exec("postconf -e 'content_filter = " . ($configure_lmtp ? "lmtp" : "amavis" ) . ":[127.0.0.1]:10024'");
 
 				// fixme: should read this from conf templates
-				exec("postconf -e 'smtpd_sender_restrictions = ${raslm} check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:/etc/postfix/tag_as_foreign.re, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf'");
+				exec("postconf -e 'smtpd_sender_restrictions = ${raslm} check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, reject_unlisted_sender, check_sender_access regexp:/etc/postfix/tag_as_foreign.re'");
 			}
 		}