Fix Backup mailboxes expunging

2 files changed, 5 insertions, 7 deletions

diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix
index 523c017..9836f78 100644
--- a/modules/private/mail/dovecot.nix
+++ b/modules/private/mail/dovecot.nix
@@ -261,7 +261,7 @@ in
 
     services.cron.systemCronJobs = let
       cron_script = pkgs.writeScriptBin "cleanup-imap-folders" ''
-        ${pkgs.dovecot}/bin/doveadm expunge -A MAILBOX "Backup/*" NOT UID 1:256 2>&1 > /dev/null | grep -v "Mailbox doesn't exist:" | grep -v "Info: Opening DB"
+        ${pkgs.dovecot}/bin/doveadm expunge -A MAILBOX "Backup/*" NOT FLAGGED BEFORE 8w 2>&1 > /dev/null | grep -v "Mailbox doesn't exist:" | grep -v "Info: Opening DB"
         ${pkgs.dovecot}/bin/doveadm expunge -A MAILBOX Junk SEEN NOT FLAGGED BEFORE 4w 2>&1 > /dev/null | grep -v "Mailbox doesn't exist:" | grep -v "Info: Opening DB"
         ${pkgs.dovecot}/bin/doveadm expunge -A MAILBOX Trash NOT FLAGGED BEFORE 4w 2>&1 > /dev/null | grep -v "Mailbox doesn't exist:" | grep -v "Info: Opening DB"
         '';
diff --git a/modules/private/mail/sieve_scripts/backup.sieve b/modules/private/mail/sieve_scripts/backup.sieve
index c922999..3014c0a 100644
--- a/modules/private/mail/sieve_scripts/backup.sieve
+++ b/modules/private/mail/sieve_scripts/backup.sieve
@@ -1,9 +1,7 @@
 # vim: filetype=sieve
 require ["copy","mailbox","fileinto","regex"];
-if not header :regex "subject" "^TestMailImmae ?$" {
-  if header :is "X-Spam" "Yes" {
-    fileinto :create :copy "Backup/Spam";
-  } else {
-    fileinto :create :copy "Backup/Ham";
-  }
+if header :is "X-Spam" "Yes" {
+  fileinto :create :copy "Backup/Spam";
+} else {
+  fileinto :create :copy "Backup/Ham";
 }