some more scrubbing

darcs-hash:20080721050508-84dde-5e6d8121b403e9b81f8f46a2f5c7de5908b9593a.gz

1 files changed, 13 insertions, 0 deletions

diff --git a/maildaemon.php b/maildaemon.php
index 432ce6343..3f8d6a5b5 100755
--- a/maildaemon.php
+++ b/maildaemon.php
@@ -199,12 +199,25 @@ class MailerDaemon {
 			if (preg_match('/^\s*On.*wrote:\s*$/', $line)) {
 				continue;
 			}
+			// probably interesting to someone, not us
+			if (preg_match('/^\s*Sent via/', $line)) {
+				continue;
+			}
 			// skip everything after a sig
 			if (preg_match('/^\s*--+\s*$/', $line) ||
 				preg_match('/^\s*__+\s*$/', $line))
 			{
 				break;
 			}
+			// skip everything after Outlook quote
+			if (preg_match('/^\s*-+\s*Original Message\s*-+\s*$/', $line)) {
+				break;
+			}
+			// skip everything after weird forward
+			if (preg_match('/^\s*Begin\s+forward/', $line)) {
+				break;
+			}
+
 			$output .= ' ' . $line;
 		}