Fix for email parsing from Outlook clients.

Summary: D1239 got it mostly right, but some versions of Outlook apparently put a '> ' in front of the 'Original Message' marker, which the parser couln't grok.

Test Plan: Added a test case to the unit tests, applied the patch to my install and asked one of my heathen Outlook using colleagues to reply to a Conpherence post.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D8998

src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php

@@ -76,13 +76,13 @@ final class PhabricatorMetaMTAEmailBodyParser {
 
     // Outlook english
     $body = preg_replace(
-      '/^\s*-----Original Message-----.*?/imsU',
+      '/^\s*(> )?-----Original Message-----.*?/imsU',
       '',
       $body);
 
     // Outlook danish
     $body = preg_replace(
-      '/^\s*-----Oprindelig Meddelelse-----.*?/imsU',
+      '/^\s*(> )?-----Oprindelig Meddelelse-----.*?/imsU',
       '',
       $body);
 

src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php

@@ -168,6 +168,14 @@ OKAY
 
 > On 17 Oct 2013, at 17:47, "Someone" <somebody@somewhere> wrote:
 > ...
+EOMAIL
+,
+<<<EOMAIL
+OKAY
+
+> -----Original Message-----
+>
+> ...
 EOMAIL
     );
   }