X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/98d09b7c38b80132e76f0e58eadafd86872cb30e..53690a27958f40bc80a598842a629fe747d8078f:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index 07482cd..d1cbb9f 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -65,7 +65,7 @@ CRM_MISCLASSIFY_SA_AUTOTRAIN_LIMIT_SPAM=11
 NL="
 "
 RE_MYDOMAIN="(.+\.)*madduck\.net"
-RE_MAILRELAYS="(seamus|clegg)\.madduck\.net"
+RE_MAILRELAYS="(seamus|swan|clegg)\.madduck\.net"
 RE_SPACE="[ 	]"
 RE_NOT_SPACE="[^ 	]"
 RE_SPACE_NEWLINE="(^|$RE_SPACE)"
@@ -158,12 +158,13 @@ INCLUDERC=$PMDIR/get-msgid
 :0
 *$ ^Subject:$RE_EXTRACT_HEADER_VALUE
 {
-  SUBJECT=$MATCH
+  SUBJECT="$MATCH"
 
   :0
   * SUBJECT ?? =\?.+\?[QBqb]\?.+\?=
   {
     SUBJECT="`PERL_UNICODE=S perl -MEncode=decode -e \"print decode(\\\"MIME-Header\\\", \\\"$SUBJECT\\\") . \\\"\n\\\";\"`"
+    SUBJECT_ENCODED="$MATCH"
   }
 }