From c36a06ac696bb5ecf002d2e69c8f7cc81adffbfa Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 1 Mar 2010 12:29:03 +0000
Subject: [PATCH 1/1] Fix quoting to strip Receiveds

---
 stump/etc/sanitise_and_quote_email.INO | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stump/etc/sanitise_and_quote_email.INO b/stump/etc/sanitise_and_quote_email.INO
index 9446cd4..1526209 100755
--- a/stump/etc/sanitise_and_quote_email.INO
+++ b/stump/etc/sanitise_and_quote_email.INO
@@ -1,7 +1,12 @@
-#!/usr/bin/perl -p
+#!/usr/bin/perl -n
 
-s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q%DOMAIN%\E | \Q%SLIMYDOMAIN%\E) \b
-		 ,%OURUSER%+?\@$1,igx
-	unless m/^$/..0;
+unless (m/^$/..0) {
+    $skip= 0 unless m/^[ \t]/;
+    $skip= 1 if m/^received\s*\:/i;
+    next if $skip;
+    s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q%DOMAIN%\E | \Q%SLIMYDOMAIN%\E) \b
+		 ,%OURUSER%+?\@$1,igx;
+}
 
 s/^/> /;
+print or die $!;
-- 
2.30.2