diff --git a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt
deleted file mode 100644
index 17160f2fd..000000000
--- a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-DO NOT PUT PERSONAL ITEMS HERE!
-This folder in its entirety is managed by FreedomBox.
diff --git a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve
index aebaf100a..a20a0f326 100644
--- a/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve
+++ b/plinth/modules/email/data/etc/dovecot/freedombox-sieve-after/sort-spam.sieve
@@ -1,8 +1,5 @@
 require ["fileinto", "mailbox"];
 
-if anyof(header :contains "X-Spam" "Yes",
-         header :contains "X-Spam-Status" "Yes",
-         header :matches "X-Spam-Flag" "YES") {
+if header :is "X-Spam" "Yes" {
   fileinto :create "Junk";
-  stop;
 }