X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/5af333ca3b83425e5cb3aa704b37654d576856c1..0ca203ebccad19e90b5826facf8ed0031c29682c:/procmail/to-gmail

diff --git a/procmail/to-gmail b/procmail/to-gmail
index 4909c0c..4996d91 100644
--- a/procmail/to-gmail
+++ b/procmail/to-gmail
@@ -1,11 +1,23 @@
-:0 c
+:0
 * ORIG_DOMAIN ?? ^(mass|r2e)\.madduck\.net$
-* !^X-Mailer: swaks
 {
-  LOG="gmail:       archiving message $MSGID with gmail$NL"
-  SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
-  TRAP=""
+  :0 c
+  *$ ! $MSG_DEJAVU
+  * ! MSG_TEST ?? .
+  {
+    LOG="gmail:       archiving message $MSGID$NL"
+    SENDMAILFLAGS="$SENDMAILFLAGS -f $ID"
+    TRAP
 
-  :0
-  ! martin.krafft@gmail.com
+    :0
+    ! martin.krafft+archive@gmail.com
+  }
+
+  :0 E
+  * MSG_TEST ?? .
+  { LOG="gmail:       not archiving test message$NL" }
+
+  :0 E
+  *$ $MSG_DEJAVU
+  { LOG="gmail:       not archiving resubmitted message$NL" }
 }