From dba1bd96c1387eb28e44603145dbecbc24b79aaa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 3 May 2012 14:15:21 +0000
Subject: [PATCH] Fixed: FS#2201 - sieve duplicate message

---
 server/conf/sieve_filter.master     | 3 ++-
 server/conf/sieve_filter_1.2.master | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 2b4a9fc2f..a34c50b43 100644
--- a/server/conf/sieve_filter.master
+++ b/server/conf/sieve_filter.master
@@ -4,7 +4,6 @@ require ["fileinto", "regex", "vacation"];
 <tmpl_if name="cc">
 # Send a copy of email to
 redirect "<tmpl_var name='cc'>";
-keep;
 </tmpl_if>
 
 <tmpl_if name="move_junk" op="==" value="y">
@@ -18,6 +17,8 @@ if header :contains "X-Spam-Flag" "YES" {
 
 <tmpl_var name='custom_mailfilter'>
 
+keep;
+
 <tmpl_if name="autoresponder" op="==" value="y">
 #################################################################
 # Autoreply
diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
index 89f8f0832..3b733c69e 100644
--- a/server/conf/sieve_filter_1.2.master
+++ b/server/conf/sieve_filter_1.2.master
@@ -4,7 +4,6 @@ require ["fileinto", "regex", "date", "relational", "vacation"];
 <tmpl_if name="cc">
 # Send a copy of email to
 redirect "<tmpl_var name='cc'>";
-keep;
 </tmpl_if>
 
 <tmpl_if name="move_junk" op="==" value="y">
@@ -18,6 +17,8 @@ if header :contains "X-Spam-Flag" "YES" {
 
 <tmpl_var name='custom_mailfilter'>
 
+keep;
+
 <tmpl_if name="autoresponder" op="==" value="y">
 #################################################################
 # Autoreply
-- 
GitLab