Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Author: florian030

server/conf/sieve_filter_1.2.master

@@ -1,12 +1,5 @@
 require ["fileinto", "regex", "date", "relational", "vacation"];
 
-<tmpl_if name="cc">
-# Send a copy of email to
-<tmpl_loop name="ccloop">
-redirect "<tmpl_var name='address'>";
-</tmpl_loop>
-</tmpl_if>
-
 <tmpl_if name="move_junk" op="==" value="y">
 # Move spam to spam folder
 if header :contains "X-Spam-Flag" "YES" {
@@ -16,6 +9,13 @@ if header :contains "X-Spam-Flag" "YES" {
 }
 </tmpl_if>
 
+<tmpl_if name="cc">
+# Send a copy of email to
+<tmpl_loop name="ccloop">
+redirect "<tmpl_var name='address'>";
+</tmpl_loop>
+</tmpl_if>
+
 <tmpl_var name='custom_mailfilter'>
 
 keep;