--- mailhandler.retrieve.inc.orig	2010-09-01 18:45:22.000000000 -0400
+++ mailhandler.retrieve.inc	2010-09-01 18:45:28.000000000 -0400
@@ -215,8 +215,7 @@
       if (!isset($endcommands)) $endcommands = $i;
     }
     // Stop when we encounter the sig. we'll discard all remaining text.
-    $start = substr($lines[$i], 0, strlen($sep)+3);
-    if ($sep && strstr($start, $sep)) { // mail clients sometimes prefix replies with ' >'
+    if ($sep && rtrim($lines[$i],"\r\n") == $sep) { 
       break;
     }
   }