From be7693a8e1fc8bcbeb2afe5a153942d98650d667 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 9 Jan 2017 11:39:27 +0100
Subject: [PATCH] Sieve tag handling changes

---
 data/conf/dovecot/sieve_after         | 2 +-
 data/conf/rspamd/lua/rspamd.local.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/conf/dovecot/sieve_after b/data/conf/dovecot/sieve_after
index ae6aa5fe..d668a94c 100644
--- a/data/conf/dovecot/sieve_after
+++ b/data/conf/dovecot/sieve_after
@@ -7,6 +7,6 @@ require "envelope";
 if header :contains "X-Spam-Flag" "YES" {
   fileinto "Junk";
 }
-if envelope :detail :matches "to" "*" {
+if allof (envelope :detail :matches "to" "*", header :contains "X-Moo-Tag" "YES") {
   fileinto :create "INBOX/${1}";
 }
diff --git a/data/conf/rspamd/lua/rspamd.local.lua b/data/conf/rspamd/lua/rspamd.local.lua
index 4b02bf57..7e254d3b 100644
--- a/data/conf/rspamd/lua/rspamd.local.lua
+++ b/data/conf/rspamd/lua/rspamd.local.lua
@@ -48,7 +48,7 @@ rspamd_config.ADD_DELIMITER_TAG = {
         })
         end
       else
-        rspamd_logger.infox("Add X-Move-Tag header")
+        rspamd_logger.infox("Add X-Moo-Tag header")
         task:set_rmilter_reply({
           add_headers = {['X-Moo-Tag'] = 'YES'}
         })