diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index 57fb1934408364e2c2eef66eb757b4c099686d6d..ecf3db3a4b1eadd884d90967b811fb1449db3d67 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -61,7 +61,7 @@ class installer extends installer_base {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index f1c8d672042ac415e92b295dfac6a988bcc81a9d..70bed24d10ae482f7e2c853f081e10cb24eec824 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -394,7 +394,7 @@ class installer_dist extends installer_base {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index b3cfc207194f18f4dbddc039942fb06ddeb411af..46bd662535dbdec8a00c940c747001531c4e1f3d 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -303,7 +303,7 @@ class installer extends installer_base
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index f991c77d2be66295c1a3756c543e174114f39f5c..598f98ec431ab1defc4f9dff524e3ff99cd3a9c5 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -404,7 +404,7 @@ class installer_dist extends installer_base {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 95e0d9f5a50124a14d0ee18e9372c8497a9f7309..a504b3b255b85998ed90180269e09716241b0f0b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1322,7 +1322,7 @@ class installer_base {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 5b898f84c667eaf5f298f87a29983b7f7a26053d..a4e973973e66629deca2949698168b4acf559801 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -148,17 +148,20 @@ class mail_user_filter_plugin {
 				}
 				$content .= 'if size :over '.intval($page_form->dataRecord["searchterm"]).$unit.' {'."\n";
 			} else {
-			
-				if($page_form->dataRecord["source"] == 'Header') {
-					$parts = explode(':',trim($page_form->dataRecord["searchterm"]));
-					$page_form->dataRecord["source"] = trim($parts[0]);
-					unset($parts[0]);
-					$page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
-					unset($parts);
+				if($page_form->dataRecord["source"] == 'Detail') {
+					$content .= 'if envelope :detail :regex "to" ["';
+				} else {
+                    if($page_form->dataRecord["source"] == 'Header') {
+                        $parts = explode(':',trim($page_form->dataRecord["searchterm"]));
+                        $page_form->dataRecord["source"] = trim($parts[0]);
+                        unset($parts[0]);
+                        $page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
+                        unset($parts);
+                    }
+
+                    $content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
 				}
 
-				$content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
-
 				$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
 				$searchterm = str_replace(
 					array(
diff --git a/interface/web/mail/form/mail_user_filter.tform.php b/interface/web/mail/form/mail_user_filter.tform.php
index 76b54feb09037f7db2582471e95b916ac96e9db6..02dfa59b470e459f6436cc4d49a5e8de75ead280 100644
--- a/interface/web/mail/form/mail_user_filter.tform.php
+++ b/interface/web/mail/form/mail_user_filter.tform.php
@@ -88,7 +88,7 @@ $form["tabs"]['filter'] = array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt')
+			'value'  => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt', 'Detail'=>'detail_txt')
 		),
 		'op' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng
index e951d18c6bdb33a96ec2a2868075b778a7d32eaf..d789c025d758318e7983aaa19bb968423754643f 100644
--- a/interface/web/mail/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_filter.lng
@@ -27,4 +27,5 @@ $wb['reject_txt'] = 'Abweisen';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Verschiebe nach';
 $wb['mark_read_txt'] = 'Als gelesen markieren';
+$wb['detail_txt'] = 'Detail-Angabe des Empfängers (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mail/lib/lang/en_mail_user_filter.lng b/interface/web/mail/lib/lang/en_mail_user_filter.lng
index 6bec7601c32f7c0277a0c4b44baf90167233cad2..6f1a62ae138021047a00abd20d9f6407232ec0c4 100644
--- a/interface/web/mail/lib/lang/en_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/en_mail_user_filter.lng
@@ -27,4 +27,5 @@ $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
 $wb['mark_read_txt'] = 'Mark as read';
+$wb['detail_txt'] = 'Detail part in recipient (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
index 1665ba14d22763412387e00b009f445090e78d4b..ac4016713bf20014df5e9e7b4b15bfb580500779 100644
--- a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
@@ -18,4 +18,5 @@ $wb['begins_with_txt'] = 'Startet mit';
 $wb['ends_with_txt'] = 'Endet mit';
 $wb['move_to_txt'] = 'Verschieben nach';
 $wb['delete_txt'] = 'Löschen';
+$wb['detail_txt'] = 'Detail-Angabe des Empfängers (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
index 23451b74dba6d02a5e79cd6029f6b430713e87b7..652d509741db3269dce302c97268cf66ee8d4ae5 100644
--- a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
@@ -18,4 +18,5 @@ $wb['begins_with_txt'] = 'Begins with';
 $wb['ends_with_txt'] = 'Ends with';
 $wb['move_to_txt'] = 'Move to';
 $wb['delete_txt'] = 'Delete';
+$wb['detail_txt'] = 'Detail part in recipient (user+detail@domain.com)';
 ?>
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 43dfeac0520243a477c1441e0455cf45c15a201d..bfd75c4d43e6279ecba65701c7151ccade11fa79 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -1,4 +1,4 @@
-require ["fileinto", "regex", "vacation", "imap4flags"];
+require ["fileinto", "regex", "vacation", "imap4flags", "envelope", "subaddress"];
 
 <tmpl_if name="cc">
 # Send a copy of email to
diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
index 7580e190dc8c3bad9b185f3fc918dc4cfdb4b5ec..47370ec0a919e4c165835e8fd5ae8734cc7b5c45 100644
--- a/server/conf/sieve_filter_1.2.master
+++ b/server/conf/sieve_filter_1.2.master
@@ -1,4 +1,4 @@
-require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags"];
+require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress"];
 
 <tmpl_if name="cc">
 # Send a copy of email to