From 3031cacf7cdae16c8ac58ca399675b22ab3ea0d9 Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Thu, 5 Dec 2019 10:56:49 +0100
Subject: [PATCH] generalise the X-Bcc-* fields

---
 .mutt/sendmail | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 635ff3e..881935d 100755
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -31,9 +31,17 @@ for i in "$@"; do
 done
 
 cat > $TMPFILE
-recipients="$recipients $(formail -czx X-Bcc-Spool: < "$TMPFILE" | tr -d ',')"
+
+remove_headers=
+if ! formail -czx "Resent-" < "$TMPFILE" | grep -q .; then
+  # only do this for original mails, not bounces
+  recipients="$recipients $(formail -czx "X-Bcc" < "$TMPFILE" | tr -d ',')"
+  remove_headers="$remove_headers -IX-Bcc"
+fi
 args=$(for i in $recipients; do echo "--arg=$i"; done)
 run-parts --exit-on-error --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
-formail -I X-Bcc-Spool: < "$TMPFILE" | eval $SENDMAIL "$sendmail_args" -- "$recipients"
+
+formail $remove_headers < "$TMPFILE" \
+  | eval $SENDMAIL "$sendmail_args" -- "$recipients"
 
 cleanup
-- 
2.39.2