diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
index 2b4a9fc2f8dcbc49c7cc17e43d5c013d7ff20b3b..a34c50b43f807532a8e5fb1a666ae5f4dd93718a 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 89f8f08320c196c9f089649643aa51df35726d82..3b733c69ebae55219e05da608df125b9c1fd27f1 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