diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 2f3d7568e85bd715faa8de97a525606ed73481f0..e94a98eb7e4de2389dbf81489187e76d5b0f443f 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -76,3 +76,7 @@ ALTER TABLE `dns_soa` CHANGE `dnssec_algo` `dnssec_algo` SET('NSEC3RSASHA1','ECD
 ALTER TABLE `client_template` CHANGE `ssh_chroot` `ssh_chroot` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
 ALTER TABLE `client_template` CHANGE `web_php_options` `web_php_options` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
 
+-- add option to forward in lda, default to forward in mta except for existing forwards
+ALTER TABLE `mail_user` ADD `forward_in_lda` enum('n','y') NOT NULL default 'n' AFTER `cc`;
+UPDATE `mail_user` set `forward_in_lda` = 'y' where `cc` != '';
+
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 90c39c03a73b73ba749e96c0f8fa57e3ed777e2b..08fa18c371b1e43d324e8330507ee0a462a7c582 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1041,6 +1041,7 @@ CREATE TABLE `mail_user` (
   `maildir_format` varchar(255) NOT NULL default 'maildir',
   `quota` bigint(20) NOT NULL default '-1',
   `cc` text,
+  `forward_in_lda` enum('n','y') NOT NULL default 'n',
   `sender_cc` varchar(255) NOT NULL default '',
   `homedir` varchar(255) NOT NULL default '',
   `autoresponder` enum('n','y') NOT NULL default 'n',
diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master
index 17e1cdf0bf93c91370183d62947d277b54e02015..87553d5f9d8ce8b121c47fa96b5acb11a573e712 100644
--- a/install/tpl/mysql-virtual_email2email.cf.master
+++ b/install/tpl/mysql-virtual_email2email.cf.master
@@ -2,6 +2,4 @@ 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 postfix = 'y' AND disabledeliver = 'n' AND server_id = {server_id}
-        UNION
-        SELECT cc AS email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}
+query = 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}
diff --git a/install/tpl/mysql-virtual_mailboxes.cf.master b/install/tpl/mysql-virtual_mailboxes.cf.master
index 97825f9ffc9c492e68f8703efce25f00b79d66e7..281bedb07b531177f46a0e13a208ddc4c955bfb1 100644
--- a/install/tpl/mysql-virtual_mailboxes.cf.master
+++ b/install/tpl/mysql-virtual_mailboxes.cf.master
@@ -2,4 +2,4 @@ user = {mysql_server_ispconfig_user}
 password = {mysql_server_ispconfig_password}
 dbname = {mysql_server_database}
 hosts = {mysql_server_ip}
-query = select CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') from mail_user where login = '%s' and postfix = 'y' and server_id = {server_id}
+query = select CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') from mail_user where login = '%s' and postfix = 'y' and disabledeliver = 'n' and server_id = {server_id}
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 67330f465860f0c129ea319c1ee8acdbd1429761..85e310648b23d2942360aadbea9614cfebeb5862 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -189,6 +189,12 @@ $form["tabs"]['mailuser'] = array(
 			'width'  => '30',
 			'maxlength' => '65535'
 		),
+		'forward_in_lda' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'sender_cc' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index 829de6a749ee61bdebeb6f6bb27e8e37fea648cf..88b89d0fb417547f00e15857f30c6d9087286b12 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 126ec603d22d3d754816487e7881e22ff20ed77d..bee86d8d3194fca098db9f028bb334c03b264692 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(По желание)';
 $wb['autoresponder_active'] = 'Разреши автоматичен отговор';
 $wb['cc_txt'] = 'Изпрати копие до:';
 $wb['cc_error_isemail'] = 'Полето с Изпрати копие до: не съдържа валиден емайл адрес';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Домейн';
 $wb['now_txt'] = 'Сега';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 8e3edd6950c29b2420f8f10d5f4dc54cbbb023f7..8d72534d6b027c9b1162a1b90129bc10246a9b7b 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -46,8 +46,10 @@ $wb['name_txt'] = 'Nome';
 $wb['name_optional_txt'] = '(Opcional)';
 $wb['autoresponder_active'] = 'Habilitar auto-resposta';
 $wb['cc_txt'] = 'Enviar cópia para';
-$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
 $wb['cc_error_isemail'] = 'O campo "Enviar cópia para" contém um endereço de e-mail inválido.';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
+$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
 $wb['sender_cc_error_isemail'] = 'O campo "Enviar cópia oculta para" contém um endereço de e-mail inválido.';
 $wb['domain_txt'] = 'Domínio';
 $wb['now_txt'] = 'Agora';
diff --git a/interface/web/mail/lib/lang/ca_mail_user.lng b/interface/web/mail/lib/lang/ca_mail_user.lng
index 7fd4263e976aaa94d92480bd5c28401c4e977aa5..a0afb01ee310bc7f92cb5785f8dee6259581e07d 100644
--- a/interface/web/mail/lib/lang/ca_mail_user.lng
+++ b/interface/web/mail/lib/lang/ca_mail_user.lng
@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(Optionnel)';
 $wb['autoresponder_active'] = 'Activer le répondeur automatique';
 $wb['cc_txt'] = 'Envoyer une copie à';
 $wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse courriel valide';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domaine';
 $wb['now_txt'] = 'Maintenant';
 $wb['login_error_unique'] = 'Ce nom d\'utilisateur est déjà pris.';
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 835f2918c1dc2589745fe9c8cea89367dd523c53..0b5f73080c3abc3bb13d7e03fc82ea76d4535b88 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(volitelné)';
 $wb['autoresponder_active'] = 'Povolit automatický odpovídač';
 $wb['cc_txt'] = 'Odeslat příchozí kopii na';
 $wb['cc_error_isemail'] = 'Adresa uvedená v poli zaslat kopii na je neplatná';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Doména';
 $wb['now_txt'] = 'Nyní';
 $wb['login_error_unique'] = 'Přihlášovací jméno je již obsazeno.';
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index dbbf54d1501fb689b480843c1a05ceba6d0658f5..c99abe8e8d5a06e3659e3a47c69872d28c2c7680 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -46,6 +46,8 @@ $wb['name_optional_txt'] = '(optional)';
 $wb['autoresponder_active'] = 'Autoresponder aktivieren';
 $wb['cc_txt'] = 'Eingehende Mails in Kopie senden an';
 $wb['cc_error_isemail'] = 'Das Feld "Kopie senden an" enthält keine gültige E-Mail Adresse';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['login_error_unique'] = 'Benutzername wird bereits verwendet.';
 $wb['login_error_regex'] = 'Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -.';
 $wb['login_txt'] = 'Anmelden';
diff --git a/interface/web/mail/lib/lang/dk_mail_user.lng b/interface/web/mail/lib/lang/dk_mail_user.lng
index 04196d6b29011205d481a692024fec4dc4bf8292..36487cd836248ddd0d21ade098a5509afa2d3052 100644
--- a/interface/web/mail/lib/lang/dk_mail_user.lng
+++ b/interface/web/mail/lib/lang/dk_mail_user.lng
@@ -45,6 +45,8 @@ $wb['name_optional_txt'] = '(Valgfri)';
 $wb['autoresponder_active'] = 'Aktiver autosvarer';
 $wb['cc_txt'] = 'Send kopi til';
 $wb['cc_error_isemail'] = '-Send kopi til- felt indeholder ikke en gyldig e-mail adresse';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domæne';
 $wb['now_txt'] = 'Nu';
 $wb['login_error_unique'] = 'Log ind er allerede taget.';
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index b273f6b8145af328adfd6aa6a5d8d3a11181f3ab..9c53de9fe3de3f350e6cb65228c82dcf6a53bb4f 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Προαιρετικό)';
 $wb['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης';
 $wb['cc_txt'] = 'Αποστολή αντιγράφου σε ';
 $wb['cc_error_isemail'] = 'Προς';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Τώρα';
 $wb['login_error_unique'] = 'Το όνομα χρησιμοποιείται ήδη';
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index ed6b6e3bd326669b25b117563e86a31eefcc89f8..ead8a2a0339a3db95fe058dfd09fbbf825e6107e 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -46,8 +46,10 @@ $wb["name_txt"] = 'Name';
 $wb["name_optional_txt"] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
-$wb['sender_cc_txt'] = 'Send outgoing BCC to';
 $wb['cc_error_isemail'] = 'The -Send copy to- field does not contain a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
+$wb['sender_cc_txt'] = 'Send outgoing BCC to';
 $wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt']='Now';
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 6757df0854e68d5f47114734fce062c7130227ed..00f9074c1c80a991d9b87f5aca0985378104f0be 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -12,9 +12,11 @@ $wb['autoresponder_text_txt'] = 'Texto';
 $wb['autoresponder_txt'] = 'Habilitado';
 $wb['backup_copies_txt'] = 'Número de copias de seguridad';
 $wb['backup_interval_txt'] = 'Intervalo de copias de seguridad';
-$wb['cc_error_isemail'] = 'El campo -Enviar copia a- no contiene una dirección de correo válida.';
 $wb['cc_note_txt'] = '(Separe múltiples cuentas de correo con comas)';
 $wb['cc_txt'] = 'Enviar copia a';
+$wb['cc_error_isemail'] = 'El campo -Enviar copia a- no contiene una dirección de correo válida.';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['cryptpwd_txt'] = 'Contraseña';
 $wb['custom_mailfilter_txt'] = 'Filtro de correo personalizado';
 $wb['daily_backup_txt'] = 'Diariamente';
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index ed3635c1ae8d7337f189604609e5cab5709e91f8..6f06d655c456a128ddf73b9062d6c4a7350ed96e 100644
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Valinnainen)';
 $wb['autoresponder_active'] = 'Ota lomavastaaja käyttöön';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index cce8f0a8a16c1dfac899912fd074e08966bc26f6..8c5cb44fbd24e4250ee6e7c434b23ae373afed89 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(Optionnel)';
 $wb['autoresponder_active'] = 'Activer le répondeur automatique';
 $wb['cc_txt'] = 'Envoyer une copie à';
 $wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse e-mail valide';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domaine';
 $wb['now_txt'] = 'Maintenant';
 $wb['login_error_unique'] = 'Ce nom d’utilisateur est déjà pris.';
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 0cb1b91849c50d752b0d3a3ddd9da442d0dc0cea..0a7feb9c38888758964b7024be71bd620acf8e77 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The -Send copy to- field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domena';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index 610f40b4ba8b0342590967991a9512ae97d19d55..09a0d7a8de5e00a98ea28c4bdd39915d95d9afb5 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Opcionális)';
 $wb['autoresponder_active'] = 'Automatikus válasz engedélyezése';
 $wb['cc_txt'] = 'Másolat küldése';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index e4daf311f334f71992a3d9a3d2040c1197c1c61b..9abd07d28bc06d6de438c4579c42a9330cca1598 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Opsional)';
 $wb['autoresponder_active'] = 'Aktifkan Penjawab Otomatis';
 $wb['cc_txt'] = 'Kirim salinan ke';
 $wb['cc_error_isemail'] = 'Kolom Kirim salinan ke tidak berisi alamat email yang valid';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index 34b523f5519cc5f2dd6222d9be95123ed0513fb0..0b38c32fcb74388e1ac2b8062072905d68df5b39 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Opzionale)';
 $wb['autoresponder_active'] = 'Abilita autorisponditore';
 $wb['cc_txt'] = 'Trasmetti copia a';
 $wb['cc_error_isemail'] = 'Il campo trasmetti copia a non contiene un indirizzo email valido';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Dominio';
 $wb['now_txt'] = 'Ora';
 $wb['login_error_unique'] = 'Questo Login è già occupato.';
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index 7b6b48dca49915804de56b50f85551a43d09a65d..bb89671d9cad68695e9f2e044c8ddb8a73529a86 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 83002f79aaef705f59ffdc9b0c210799339d451a..9e35762618677bae6ba1be2f7538da0488b7557b 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optioneel)';
 $wb['autoresponder_active'] = 'Inschakelen autobeantwoorden';
 $wb['cc_txt'] = 'Stuur kopie naar';
 $wb['cc_error_isemail'] = 'Het \\"Stuur kopie naar\\" veld bevat geen geldig e-mail adres';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Nu';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index 15ddeca66f883c3d5a8ab11ef518e24cbf199947..44462af34cca69012daaf3a74fde6e0ad8c9529b 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Opcjonalnie)';
 $wb['autoresponder_active'] = 'Uruchom autorespondera';
 $wb['cc_txt'] = 'Wyślij kopię do';
 $wb['cc_error_isemail'] = 'Pole wysyłania kopii nie zawiera poprawnego adresu e-mail';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domena';
 $wb['now_txt'] = 'Teraz';
 $wb['login_error_unique'] = 'Login jest już w użyciu.';
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 9f6227e268ccd7031d32304aecab61c6e134b16f..e197f448c6fdc92a82cead3b0405f580205dee2c 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index b358960525f11a11af19a916c605706c90a08205..85167e6b7ceccfb7040d9c3d9fbb5e2d6a7a06e7 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index a6f8a9fb7e9fb2bdf5afacc03682201d5ffd1be6..4fb2147ddb6b71a4927bada4998226d78d49e8a3 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Опционально)';
 $wb['autoresponder_active'] = 'Включить автоответчик';
 $wb['cc_txt'] = 'Отправить копию';
 $wb['cc_error_isemail'] = 'Поле -Отправить копию- не содержит действительный адрес электронной почты';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Домен';
 $wb['now_txt'] = 'Сейчас';
 $wb['login_error_unique'] = 'Логин уже занят.';
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index f528bb3ef4659c4b8be6028af6f5f9d8e7c678f5..270d3de346913acf3f9de163a2347c117f0b87f1 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Frivilligt)';
 $wb['autoresponder_active'] = 'Aktivera autosvaret';
 $wb['cc_txt'] = 'Skicka kopia till';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domän';
 $wb['now_txt'] = 'Nu';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index 207be539474755db980d61a9cce7b09d6ccb604a..d12e8abe02fc973990014bae8729e1742362546c 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Optional)';
 $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['cc_txt'] = 'Send copy to';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 $wb['domain_txt'] = 'Domain';
 $wb['now_txt'] = 'Now';
 $wb['login_error_unique'] = 'Login is already taken.';
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index 203338047a225c8e594cd4ff1bfd3397ebc6fa4b..3ea2afe6caece20f81c2f1a79e99816df877e636 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -46,8 +46,10 @@ $wb['name_txt'] = 'Ad';
 $wb['name_optional_txt'] = '(İsteğe bağlı)';
 $wb['autoresponder_active'] = 'Otoyanıtlayıcı kullanılsın';
 $wb['cc_txt'] = 'Kopyası şuraya gönderilsin';
-$wb['sender_cc_txt'] = 'Gidenin Gizli Kopyası Şuraya Gönderilsin';
 $wb['cc_error_isemail'] = 'Kopyası şuraya gönderilsin alanına geçerli bir e-posta adresi yazılmalı';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
+$wb['sender_cc_txt'] = 'Gidenin Gizli Kopyası Şuraya Gönderilsin';
 $wb['sender_cc_error_isemail'] = 'Gidenin gizli kopyası şuraya gönderilsin alanındaki e-posta adresi geçersiz';
 $wb['domain_txt'] = 'Etki Alanı';
 $wb['now_txt'] = 'Åžimdi';
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index c53bc8529241ea3b57b923f18936f3af26511c2e..f41851963b9ad9c06670b837b46784e7b5831bb2 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -54,6 +54,12 @@
                 <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
                 <div class="col-sm-6"><input type="text" name="cc" id="cc" value="{tmpl_var name='cc'}" class="form-control" /></div><div class="col-sm-3 input-sm"> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
             </div></div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='forward_in_lda_txt'}</label>
+                <div class="col-sm-9">
+                    <a href="#" data-toggle="tooltip" title="{tmpl_var name='tooltip_forward_in_lda_txt'}">{tmpl_var name='forward_in_lda'}</a>
+                </div>
+            </div>
             <div class="form-group">
                 <label for="sender_name" class="col-sm-3 control-label">{tmpl_var name='sender_cc_txt'}</label>
                 <div class="col-sm-6"><input type="text" name="sender_cc" id="sender_cc" value="{tmpl_var name='sender_cc'}" class="form-control" /></div><div class="col-sm-3 input-sm"> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'}
diff --git a/interface/web/mailuser/form/mail_user_cc.tform.php b/interface/web/mailuser/form/mail_user_cc.tform.php
index 5f5e13a9d8df5e599854b2f38665b690e665b4a7..fb26892584ce1970a7844b3f079d6f26bf3c1558 100644
--- a/interface/web/mailuser/form/mail_user_cc.tform.php
+++ b/interface/web/mailuser/form/mail_user_cc.tform.php
@@ -76,7 +76,13 @@ $form["tabs"]['mailuser'] = array (
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',
-			'maxlength' => '255'
+			'maxlength' => '65535'
+		),
+		'forward_in_lda' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(0 => 'n', 1 => 'y')
 		),
 		//#################################
 		// END Datatable fields
diff --git a/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ar_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/bg_mail_user_cc.lng b/interface/web/mailuser/lib/lang/bg_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/bg_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/bg_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/br_mail_user_cc.lng b/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
index 7a1e9a3d95a91ecea9173c8b7104cfc9cf8b2f19..8008ed26185aebd7eaa4fe7dfaab8c5fde0d7065 100644
--- a/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/br_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Endereço de e-mail inválido no campo "Enviar cópia
 $wb['email_is_cc_error'] = 'Endereço de e-mail e "Enviar cópia para" não podem ser os mesmos.';
 $wb['name_optional_txt'] = '(Opcional)';
 $wb['cc_note_txt'] = '(separar múltiplos endereços de e-mail com vírgulas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
index 90cc6622de0ca180fcc3fdf20c7842855db5b0fd..15c4c34307a6cf2e2e6dcdb93fc6d82c3a2f5fd1 100644
--- a/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Courriel invalide dans le champ - copie conforme -';
 $wb['email_is_cc_error'] = 'Coipe conforme invalide.';
 $wb['name_optional_txt'] = '(Optionnel)';
 $wb['cc_note_txt'] = '(Séparer chaque adresses par une virgule)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index 57ecd90b9a0887f4d07530ab3e9fb77c05eecd56..1f94bd024da306d97357a29f3bec78a1ff88d206 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Vyplněná e-mailová adresa neplatná';
 $wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mail adresu, nemůžou být stejné.';
 $wb['name_optional_txt'] = '(Volitelné)';
 $wb['cc_note_txt'] = '(Při posílání kopií na více e-mailových adres, oddělte čárkami.)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
index e43d39c1697bb0e67578a3c634048db25cc3831a..6810752d4d68c78ea1bd0e6a3c0b6f9a953bae86 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'E-Mail Adresse ungültig im -Kopie senden an- Feld';
 $wb['email_is_cc_error'] = 'E-Mail Adresse und ';
 $wb['name_optional_txt'] = '(optional)';
 $wb['cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/dk_mail_user_cc.lng b/interface/web/mailuser/lib/lang/dk_mail_user_cc.lng
index 8fafd94e5a5f36081622b78a1263f1f6efb9a691..70052fdaeb894a03e41b26e608b1e603c9e5ce5a 100644
--- a/interface/web/mailuser/lib/lang/dk_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/dk_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'E-mail adresse ugyldig i -Send kopi til- feltet';
 $wb['email_is_cc_error'] = 'E-mail adresse og send kopi til adressen kan ikke være det samme.';
 $wb['name_optional_txt'] = '(Valgfri)';
 $wb['cc_note_txt'] = '(Adskil flere e-mail adresser med kommaer)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/el_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/en_mail_user_cc.lng b/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
index 3437d50d195c8bdef543e2a688f5527250585415..b9c1a20caca304589a8f23bd50027a4555808555 100644
--- a/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/en_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb["cc_error_isemail"] = 'Email address invalid in -Send copy to- field';
 $wb["email_is_cc_error"] = 'Email address and send copy to address can not be the same.';
 $wb["name_optional_txt"] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-?>
\ No newline at end of file
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
+?>
diff --git a/interface/web/mailuser/lib/lang/es_mail_user_cc.lng b/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
index aef29a0cdbea2aeae1709bd01c8a292257398846..5b1c05a2aafcc62e87a6fac15eb4dbeaba35c9cf 100644
--- a/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/es_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['email_is_cc_error'] = 'La dirección de correo y enviar copia a, no pueden
 $wb['email_txt'] = 'Correo';
 $wb['mailbox_cc_txt'] = 'Enviar copia a direcciones de correo';
 $wb['name_optional_txt'] = '(Opcional)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng b/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/fi_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
index d29dacd8304b71ab4c6fa2281427e0e2c261a1da..a0139d0fec1a5b56a0d54a83ec01bd354afbcbb4 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Adresse e-mail invalide dans le champ - Envoyer une
 $wb['email_is_cc_error'] = 'L’adresse e-mail principale et l’addresse de copie ne peuvent pas être identiques.';
 $wb['name_optional_txt'] = '(Optionel)';
 $wb['cc_note_txt'] = '(Séparer les addresses e-mail multiples avec une virgule)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng b/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/hu_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/id_mail_user_cc.lng b/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/id_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
index 01f22f5fc856ca905f89ad73304796b5d8225639..6ed79429fb8ee19c43a3029dfe3bca0c4d92e265 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ja_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/nl_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
index b9a63d8d085e2ce396226671573ddc6431eb41f3..1ec4648925adee8e021f754d5538c8b6ce4f1aea 100644
--- a/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pl_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Adres e-mail jest niepoprawny w polu -Wyślij kopię
 $wb['email_is_cc_error'] = 'Adres e-mail i adres do wysyłki kopii nie mogą być takie same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng b/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/pt_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ro_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
index 7987b0106b3ea2aa95f2a66413d873159a53aa1e..f551318c0b39c313f4ea9a972bfa06aa0aacc9bb 100644
--- a/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/ru_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Поле -Отправить копию- не сод
 $wb['email_is_cc_error'] = 'Адрес электронной почты и адрес для отправки копии не могут быть одинаковыми.';
 $wb['name_optional_txt'] = '(Опционально)';
 $wb['cc_note_txt'] = '(Разделите несколько адресов электронной почты запятыми)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
index b01ae1b1ab15a806c91a7a5a37a04a137a479668..4894ee856cbc2c182010c33c0f12ecc9d07acf59 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Epostadressen i  -Skicka kopia till-fältet är ogilt
 $wb['email_is_cc_error'] = 'Epostadress och -Skicka kopia till- kan inte vara samma adress.';
 $wb['name_optional_txt'] = '(Frivilligt)';
 $wb['cc_note_txt'] = '(Separera flera epostadresser med kommatecken)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng b/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
index 81877884cce3a2bda6651068a61e473fad2882ce..4e7ef766e750f86f2bbecc1b29ad038bbba2ca46 100644
--- a/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/sk_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
 $wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
index 039ed7062500d7d69d127dd2148f0fa26191986d..978779767cea55d0a376232cc0b7e0bba9db1ca9 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_cc.lng
@@ -6,4 +6,6 @@ $wb['cc_error_isemail'] = '-Şuraya kopya gönder- e-posta adresi geçersiz';
 $wb['email_is_cc_error'] = 'E-posta adresi ile kopyanın gönderileceği adres aynı olamaz.';
 $wb['name_optional_txt'] = '(İsteğe bağlı)';
 $wb['cc_note_txt'] = '(Birden çok e-posta adresini virgül ile ayırarak yazın)';
+$wb['forward_in_lda_txt'] = 'Copy during delivery';
+$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
 ?>
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm
index 914f74ae3fe304f71219c823401d3b2ddde44a49..7bf44e4cadadaca4e6b8edd1751c9b0118e5282b 100644
--- a/interface/web/mailuser/templates/mail_user_cc_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm
@@ -1,12 +1,17 @@
-            <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
-                <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
+        </div>
+        <div class="form-group">
+            <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
+            <div class="col-sm-6"><input type="text" name="cc" id="cc" value="{tmpl_var name='cc'}" class="form-control" /></div><div class="col-sm-3 input-sm"> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
+        </div></div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">{tmpl_var name='forward_in_lda_txt'}</label>
+            <div class="col-sm-9">
+                <a href="#" data-toggle="tooltip" title="{tmpl_var name='tooltip_forward_in_lda_txt'}">{tmpl_var name='forward_in_lda'}</a>
             </div>
-            <div class="form-group">
-                <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
-                <div class="col-sm-6"><input type="text" name="cc" id="cc" value="{tmpl_var name='cc'}" class="form-control" /></div><div class="col-sm-3 input-sm"> &nbsp; {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
-            </div></div>
-        
+        </div>
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 130d0a7f187ccfe6baea029754e0501c5cbfc589..168063c1a2a9307cfd81c882ab890c9878507661 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -93,6 +93,7 @@ class maildeliver_plugin {
 			or $data["old"]["autoresponder_start_date"] != $data["new"]["autoresponder_start_date"]
 			or $data["old"]["autoresponder_end_date"] != $data["new"]["autoresponder_end_date"]
 			or $data["old"]["cc"] != $data["new"]["cc"]
+			or $data["old"]["forward_in_lda"] != $data["new"]["forward_in_lda"]
 		) {
 
 			$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
@@ -121,14 +122,16 @@ class maildeliver_plugin {
 				$tpl->newTemplate("sieve_filter.master");
 
 				// cc Field
-				$tmp_mails_arr = explode(',',$data["new"]["cc"]);
-				$tmp_addresses_arr = array();
-				foreach($tmp_mails_arr as $address) {
-					if(trim($address) != '') $tmp_addresses_arr[] = array('address' => trim($address));
-				}
+				if ($data["new"]["forward_in_lda"] == 'y' && $data["new"]["cc"] != '') {
+					$tmp_mails_arr = explode(',',$data["new"]["cc"]);
+					$tmp_addresses_arr = array();
+					foreach($tmp_mails_arr as $address) {
+						if(trim($address) != '') $tmp_addresses_arr[] = array('address' => trim($address));
+					}
 			
-				$tpl->setVar('cc', $data["new"]["cc"]);
-				$tpl->setLoop('ccloop', $tmp_addresses_arr);
+					$tpl->setVar('cc', $data["new"]["cc"]);
+					$tpl->setLoop('ccloop', $tmp_addresses_arr);
+				}
 
 				// Custom filters
 				if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
index 00777a1662e7c9a7dea5deddbf70ee6ac563a1a6..e1b559b367432cfb4349e6fd4e9f376e048cb22b 100644
--- a/server/plugins-available/maildrop_plugin.inc.php
+++ b/server/plugins-available/maildrop_plugin.inc.php
@@ -176,7 +176,9 @@ class maildrop_plugin {
 		// Write the custom mailfilter script, if mailfilter recipe has changed
 		if($data["old"]["custom_mailfilter"] != $data["new"]["custom_mailfilter"]
 			or $data["old"]["move_junk"] != $data["new"]["move_junk"]
-			or $data["old"]["cc"] != $data["new"]["cc"]) {
+			or $data["old"]["cc"] != $data["new"]["cc"]
+			or $data["old"]["forward_in_lda"] != $data["new"]["forward_in_lda"]
+		) {
 
 			$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
 			if(trim($data["new"]["custom_mailfilter"]) != ''
@@ -198,7 +200,7 @@ class maildrop_plugin {
 
 				$mailfilter_content = '';
 
-				if($data["new"]["cc"] != '') {
+				if ($data["new"]["forward_in_lda"] == 'y' && $data["new"]["cc"] != '') {
 					$tmp_mails_arr = explode(',',$data["new"]["cc"]);
 					foreach($tmp_mails_arr as $address) {
 						if(trim($address) != '') $mailfilter_content .= "cc \"!".trim($address)."\"\n";