merge from testing

2009-10-19 18:12:00 -04:00
parent 035d4cf86e d72748eb8e
commit fc61b71625
3 changed files with 6 additions and 2 deletions
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -365,6 +365,10 @@ class MailerDaemon
            if (preg_match('/^\s*Sent via/', $line)) {
                continue;
            }
+            if (preg_match('/^\s*Sent from my/', $line)) {
+                continue;
+            }
+
            // skip everything after a sig
            if (preg_match('/^\s*--+\s*$/', $line) ||
                preg_match('/^\s*__+\s*$/', $line))