diff --git a/interface/web/mail/lib/lang/ar.lng b/interface/web/mail/lib/lang/ar.lng
index 3d15a518a14f6aafd76f24677f0792d27922caef..0139aab0170e94da997297304235e82c99529b31 100644
--- a/interface/web/mail/lib/lang/ar.lng
+++ b/interface/web/mail/lib/lang/ar.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/bg.lng b/interface/web/mail/lib/lang/bg.lng
index c117c863a2d6bf4cc86bc55ed66bee0f0331d7c5..bc55f2cd31a974ed323960d774fcbcc95fe51d75 100644
--- a/interface/web/mail/lib/lang/bg.lng
+++ b/interface/web/mail/lib/lang/bg.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/br.lng b/interface/web/mail/lib/lang/br.lng
index 4fafa1b507e5c1c0df52cb212f0aee97c9eaa8af..f48798198fd66c04499aba7e7995dc89319a744e 100644
--- a/interface/web/mail/lib/lang/br.lng
+++ b/interface/web/mail/lib/lang/br.lng
@@ -51,3 +51,4 @@ $wb['Relay Recipients'] = 'Destinatários de retransmissão';
 $wb['Mailbox quota'] = 'Cotas das contas de email';
 $wb['add_header_txt'] = 'Cabeçalho (adicionar "X-Spam: Yes")';
 $wb['rewrite_subject_txt'] = 'Assunto (adicionar "***SPAM***" no início)';
+$wb['inactive'] = 'inactive';
diff --git a/interface/web/mail/lib/lang/ca.lng b/interface/web/mail/lib/lang/ca.lng
index 0531f19bd0e5ca604c5d63922990664da48012bc..568f82afebac724ac1e741601cd83857ff2d414f 100644
--- a/interface/web/mail/lib/lang/ca.lng
+++ b/interface/web/mail/lib/lang/ca.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Destinataires de relais';
 $wb['Mailbox quota'] = 'Quota courriel';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index b393f5679859911c1182639b063d92b2a14632c4..6f0d48ebd26afc405c3b95d44cec4ea4d51a7e87 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -47,3 +47,4 @@ $wb['Statistics'] = 'Statistiky';
 $wb['Mailbox quota'] = 'Kvóty pro e-mailové schránky';
 $wb['add_header_txt'] = 'Do záhlaví (přidat \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Do předmětu (přidat \"***SPAM***\" na začátek)';
+$wb['inactive'] = 'inactive';
diff --git a/interface/web/mail/lib/lang/de.lng b/interface/web/mail/lib/lang/de.lng
index e0f1e7cd3b30e0022f142cada3ef0a713c2182d3..69067b5a52226ef4639e7bd5c52dae75fba560fa 100644
--- a/interface/web/mail/lib/lang/de.lng
+++ b/interface/web/mail/lib/lang/de.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Empfänger';
 $wb['Mailbox quota'] = 'E-Mail Konto Speichernutzung';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/dk.lng b/interface/web/mail/lib/lang/dk.lng
index 3fe8d568ae39076d9d2268ddc46f945cd8955c6d..2c0789a3d0995b73e9aeb798caf6b3038ffb8548 100644
--- a/interface/web/mail/lib/lang/dk.lng
+++ b/interface/web/mail/lib/lang/dk.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Modtagere';
 $wb['Mailbox quota'] = 'Postboks kvota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/el.lng b/interface/web/mail/lib/lang/el.lng
index cb873eac2a3ab46f81813deaba0405598f169b4d..3374233feb71ca24be8a4f378de71f7b7bbda715 100644
--- a/interface/web/mail/lib/lang/el.lng
+++ b/interface/web/mail/lib/lang/el.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Παραλήπτες Relay';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/en.lng b/interface/web/mail/lib/lang/en.lng
index c251fc1b2bab9bf2da8dfdf2e960af10d980e81c..d90e575be1b4596666cde8a64778abb9cd247414 100644
--- a/interface/web/mail/lib/lang/en.lng
+++ b/interface/web/mail/lib/lang/en.lng
@@ -50,3 +50,4 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds "X-Spam: Yes")';
 $wb['rewrite_subject_txt'] = 'Subject (adds "***SPAM***" at the beginning)';
+$wb['inactive'] = 'inactive';
diff --git a/interface/web/mail/lib/lang/es.lng b/interface/web/mail/lib/lang/es.lng
index fdf4e5b00dc53d9b1ff7fa0d0de35c425a54499f..982a51d5675bf234d3cb3918f577d5a8b8266e9a 100644
--- a/interface/web/mail/lib/lang/es.lng
+++ b/interface/web/mail/lib/lang/es.lng
@@ -47,4 +47,5 @@ $wb['Users'] = 'Usuarios';
 $wb['Whitelist'] = 'Lista blanca';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/fi.lng b/interface/web/mail/lib/lang/fi.lng
index 78a4328336db951c351d5385aaa78d7370c3ba90..dc5314a38f6340874af59afbee7cc7963b9d812f 100644
--- a/interface/web/mail/lib/lang/fi.lng
+++ b/interface/web/mail/lib/lang/fi.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Välityksen vastaanottajat';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/fr.lng b/interface/web/mail/lib/lang/fr.lng
index a70f08029586cbe971d32de21e57c56fc90c2dcd..539c2a3c53d760a35aec1a1fedd6b5f043405f6a 100644
--- a/interface/web/mail/lib/lang/fr.lng
+++ b/interface/web/mail/lib/lang/fr.lng
@@ -47,4 +47,5 @@ $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['Email'] = 'Email';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/hr.lng b/interface/web/mail/lib/lang/hr.lng
index 877f8827f5bd5de291022b96528d15afb92109ec..14649665cd2a5597ec6625ffe2616ff8105a0f14 100644
--- a/interface/web/mail/lib/lang/hr.lng
+++ b/interface/web/mail/lib/lang/hr.lng
@@ -47,4 +47,5 @@ $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['Domain'] = 'Domain';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/hu.lng b/interface/web/mail/lib/lang/hu.lng
index f3ffa4aef0414529a3048700bb37e983663842fc..688d6d0c2542f61975b01d1363b5d3d496e00290 100644
--- a/interface/web/mail/lib/lang/hu.lng
+++ b/interface/web/mail/lib/lang/hu.lng
@@ -47,4 +47,5 @@ $wb['Server'] = 'Server';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/id.lng b/interface/web/mail/lib/lang/id.lng
index 3a2b5dfe452b76e838f7b3d4f2cc180861247af2..8a6931ce70580aeb482c19e2034d2bf9555343af 100644
--- a/interface/web/mail/lib/lang/id.lng
+++ b/interface/web/mail/lib/lang/id.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Penerima Relay';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/it.lng b/interface/web/mail/lib/lang/it.lng
index 15bc87ea3f470e39913aa49780cbe5a356e8a41f..fcd15c2b1bef2adfc15d0eba0b7d5be1e1ae0177 100644
--- a/interface/web/mail/lib/lang/it.lng
+++ b/interface/web/mail/lib/lang/it.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Destinatari inoltro';
 $wb['Mailbox quota'] = 'Quota Casella di Posta';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/ja.lng b/interface/web/mail/lib/lang/ja.lng
index 818a3ed126e4c3823692a00db81cb1983f9d3ceb..dddd49c87b9c383473c2a4aa872a7dae02bd88c8 100644
--- a/interface/web/mail/lib/lang/ja.lng
+++ b/interface/web/mail/lib/lang/ja.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng
index 6664809b46c0df078a6b3caa4bd20713bcd694fb..19272584bdd8f5746fac2e9e18157ad75c2c40c1 100644
--- a/interface/web/mail/lib/lang/nl.lng
+++ b/interface/web/mail/lib/lang/nl.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay ontvangers';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng
index 17b77019928c2b11d7eb14812ffb29ed7b56f8ee..c6050a6fe24cbf780cdc53648fe671ae5e3450b4 100644
--- a/interface/web/mail/lib/lang/pl.lng
+++ b/interface/web/mail/lib/lang/pl.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Odbiorcy przekierowania';
 $wb['Mailbox quota'] = 'Użycie skrzynek email';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/pt.lng b/interface/web/mail/lib/lang/pt.lng
index d47eb6183bdcfe5f10c3a579c545034d9649a4c4..1fbc55240ab0f48034366ffda225c3f3a99fc729 100644
--- a/interface/web/mail/lib/lang/pt.lng
+++ b/interface/web/mail/lib/lang/pt.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Recipientes de Relay';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/ro.lng b/interface/web/mail/lib/lang/ro.lng
index 0c0e85995eadbea6e8b9024dfcadd4f3d3744ee0..51c4bdbdc29b8b74343614e12f6830f2cafed762 100644
--- a/interface/web/mail/lib/lang/ro.lng
+++ b/interface/web/mail/lib/lang/ro.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/ru.lng b/interface/web/mail/lib/lang/ru.lng
index 1b7995e024a5f4366b544ec2cb74ced8e7664523..8c8a0c3c54ef5ce4f9915471fb6c09ce053bde88 100644
--- a/interface/web/mail/lib/lang/ru.lng
+++ b/interface/web/mail/lib/lang/ru.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay получатели';
 $wb['Mailbox quota'] = 'Квота почтового ящика';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/se.lng b/interface/web/mail/lib/lang/se.lng
index 7a415aa9011c8b1375d81419670403ff2c4b3dc0..88689b0d79ca4dafcd3863e36715c0c9e7cf9b87 100644
--- a/interface/web/mail/lib/lang/se.lng
+++ b/interface/web/mail/lib/lang/se.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/sk.lng b/interface/web/mail/lib/lang/sk.lng
index 7b00f9d52c575ad9c4713751c9f83b177c907536..ddef1ae73dc62b85d7111667077b471b24bdc560 100644
--- a/interface/web/mail/lib/lang/sk.lng
+++ b/interface/web/mail/lib/lang/sk.lng
@@ -47,4 +47,5 @@ $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 $wb['add_header_txt'] = 'Header (adds \"X-Spam: Yes\")';
 $wb['rewrite_subject_txt'] = 'Subject (adds \"***SPAM***\" at the beginning)';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/lib/lang/tr.lng b/interface/web/mail/lib/lang/tr.lng
index 52d1868b3eb79a95f935fd6913e74b64bf6ba6a2..e574f999d1675add314d4f467a09a2100e7918be 100644
--- a/interface/web/mail/lib/lang/tr.lng
+++ b/interface/web/mail/lib/lang/tr.lng
@@ -48,4 +48,5 @@ $wb['Global Filters'] = 'Genel Süzgeçler';
 $wb['Domain Alias'] = 'Takma Etki Alanı';
 $wb['Relay Recipients'] = 'Aktarılan Alıcılar';
 $wb['Mailbox quota'] = 'E-posta Kutusu Kotası';
+$wb['inactive'] = 'inactive';
 ?>
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 1c2bc47313745483d9ac83f50b4fb3a346cae57a..b5c7ef293b9e09c9c205a9c6ad8c680a8a7139d6 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -91,14 +91,15 @@ class page_action extends tform_actions {
 
 		// Getting Domains of the user
 		// $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
-		$sql = "SELECT domain, server_id FROM mail_domain WHERE (".$app->tform->getAuthSQL('r').") AND domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') ORDER BY domain";
+               $sql = "SELECT domain, server_id, active FROM mail_domain WHERE (".$app->tform->getAuthSQL('r').") AND domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') ORDER BY domain";
 		$domains = $app->db->queryAllRecords($sql);
 		$domain_select = '';
 		if(is_array($domains)) {
 			foreach( $domains as $domain) {
 				$domain['domain'] = $app->functions->idn_decode($domain['domain']);
 				$selected = ($domain["domain"] == @$email_parts[1])?'SELECTED':'';
-				$domain_select .= "<option value='" . $app->functions->htmlentities($domain['domain']) . "' $selected>" . $app->functions->htmlentities($domain['domain']) . "</option>\r\n";
+				$domain_select .= "<option value='" . $app->functions->htmlentities($domain['domain']) . "' $selected>" . $app->functions->htmlentities($domain['domain']) .
+					($domain['active'] == 'n' ? ' (' . $app->lng('inactive') . ')': '') . "</option>\r\n";
 			}
 		}
 		$app->tpl->setVar("email_domain", $domain_select);