When handling incoming mail, skip everything after a blank line if we already have...

diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 890f6d5b49fea9decfaf8476b0c3dbe5e28cb70c..e9ba418399dcad6709fbb2530c6360e609f03ffc 100644 (file)
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -265,6 +265,10 @@ class MailHandler
             if (preg_match('/^\s*Begin\s+forward/', $line)) {
                 break;
             }
+            // skip everything after a blank line if we already have content
+            if ($output !== '' && $line === '') {
+                break;
+            }
 
             $output .= ' ' . $line;
         }