diff --git a/roles/mail/templates/mailfilters/_common.j2 b/roles/mail/templates/mailfilters/_common.j2
index 5cfa389..a5e406a 100644
--- a/roles/mail/templates/mailfilters/_common.j2
+++ b/roles/mail/templates/mailfilters/_common.j2
@@ -26,7 +26,7 @@ if ( $EXT )
 }
 
 # check if the spam score is higher than our threshold
-if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/ )
+if ( /^X-Rspamd-Bar: \+{$MOVESCORE,}$/:h )
 {
   # yes, move to Spam folder and exit
 
diff --git a/roles/mail/templates/mailfilters/cddmail2.j2 b/roles/mail/templates/mailfilters/cddmail2.j2
index 651a95e..5e24033 100644
--- a/roles/mail/templates/mailfilters/cddmail2.j2
+++ b/roles/mail/templates/mailfilters/cddmail2.j2
@@ -11,12 +11,12 @@ if ( $MAILDIR =~ /\/lukas$/ )
   `test -d "$MAILDIR/.Kirby2"; or maildirmake "$MAILDIR/.Kirby2"`
   `test -d "$MAILDIR/.Kirby3"; or maildirmake "$MAILDIR/.Kirby3"`
 
-  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\// )
+  if( /^List-Archive: https:\/\/github.com\/getkirby-v2\//:h )
   {
     MAILDIR="$MAILDIR/.Kirby2"
   }
 
-  if( /^List-Archive: https:\/\/github.com\/getkirby\// )
+  if( /^List-Archive: https:\/\/github.com\/getkirby\//:h )
   {
     MAILDIR="$MAILDIR/.Kirby3"
   }