diff --git a/sites/all/modules/contrib/mailhandler/mailhandler.retrieve.inc b/sites/all/modules/contrib/mailhandler/mailhandler.retrieve.inc
index 52fee88..41baee0 100755
--- a/sites/all/modules/contrib/mailhandler/mailhandler.retrieve.inc
+++ b/sites/all/modules/contrib/mailhandler/mailhandler.retrieve.inc
@@ -216,7 +216,7 @@ function mailhandler_commands_parse($body) {
     }
     // 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 && strstr($start, $sep) || preg_match('/class="moz-signature/', $lines[$i])) { // mail clients sometimes prefix replies with ' >'
       break;
     }
   }