Fix quoting to strip Receiveds

diff --git a/stump/etc/sanitise_and_quote_email.INO b/stump/etc/sanitise_and_quote_email.INO
index 9446cd4a081bf104b0d322b9f96d7f915e1a9ad8..1526209aef45f4d53e7208b087a85363270b5976 100755 (executable)
--- 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 $!;