diff --git a/mailcomment.module b/mailcomment.module
index 7c723dd..3d4048e 100644
--- a/mailcomment.module
+++ b/mailcomment.module
@@ -337,7 +337,7 @@ function mailcomment_message_alter(&$message, $info) {
 /**
  * Implementation of hook_mailhandler().
  */
-function mailcomment_mailhandler($node, $result, $i, $header, $mailbox) {  
+function mailcomment_mailhandler($node, $result, $i, $header, $mailbox) {
   $matched = FALSE;
   // Build and static cache list of catchall email address hosts.
   static $hosts;
@@ -623,10 +623,10 @@ function mailcomment_build_messageid($params) {
  * Gets the mail comment parameters based on mail comment signature
  *
  * It will check the digital signature and only return parameters if they match
- * 
+ *
  * @param $identifier
  *   String - the mail comment signature string
- *   
+ *
  * @return
  *   Array of parameters.
  */
@@ -659,7 +659,7 @@ function mailcomment_check_messageparams($identifier) {
  *   uid.nid.cid.time.signature@server string
  * @param $messageid
  *   Incoming message id
- *   
+ *
  * @return
  *   Array of mail comment parameters parsed from signature string
  */
@@ -692,11 +692,16 @@ function mailcomment_signature($params) {
  *
  * @param $body
  *   raw email body
- *   
+ *
  * @return
  *   String signature or FALSE if not found.
+ *
+ * @see mailcomment_parse_messageparams()
  */
 function _mailcomment_get_signature($body) {
+  // The pattern we seek may be broken up by an EOL (some combination of "\r"
+  // and/or "\n") followed by ">", so strip those.
+  $body = preg_replace('/(\r\n|\r|\n)>/', '', $body);
   // Grab the server string and make it regex-friendly
   $server = str_replace('.', '\.', variable_get('mailcomment_server_string', 'example.com'));
   // Check for a signature match
@@ -753,7 +758,7 @@ function mailcomment_mailhandler_authenticate_info() {
 
 /**
  * Authenticates a message based on mailcomment parameters or tokenauth token.
- * 
+ *
  * @param $node
  *   Object - a node
  * @param $header
@@ -762,7 +767,7 @@ function mailcomment_mailhandler_authenticate_info() {
  *   String - body of message
  * @param $mailbox
  *   Array - mailbox configuration
- *   
+ *
  * @return Object - a node
  */
 function mailcomment_authenticate_default($node, $header, $origbody, $mailbox) {
@@ -788,7 +793,7 @@ function mailcomment_authenticate_default($node, $header, $origbody, $mailbox) {
     $node->threading = $identifier;
   }
   $params = mailcomment_check_messageparams($identifier);
-  
+
   if ($force_user_lookup) {
     // get uid from email address because we are using the header information to load the params
     // these contain the uid of the person who's post you are responding to
@@ -797,7 +802,7 @@ function mailcomment_authenticate_default($node, $header, $origbody, $mailbox) {
   }
   // Assign the params to the node object.
   $node->mailcomment['params'] = $params;
-  
+
   if ($params['uid']) {
     $account = user_load($params['uid']);
     $node->uid = $account->uid;
@@ -811,13 +816,13 @@ function mailcomment_authenticate_default($node, $header, $origbody, $mailbox) {
     module_load_include('inc', 'mailhandler', 'mailhandler.retrieve');
     mailhandler_mailhandler_authenticate('execute', variable_get('mailcomment_passthru_authentication', ''), array($node, $header, $origbody, $mailbox));
   }
-  
+
   return $node;
 }
 
 /**
  * Returns array of hostnames based on mailboxes configured as catchall addresses.
- * 
+ *
  * @return Array of hostnames, excluding TLD
  */
 function _mailcomment_catchall_hosts() {
@@ -832,14 +837,14 @@ function _mailcomment_catchall_hosts() {
 
 /**
  * Redirect request to a node and comment anchor
- * 
+ *
  * A link is added to the message body which contains the mail comment signature.
  * If this link is clicked it will reach this callback which will redirect the request
  * to the original node and comment anchor, if applicable.
- * 
+ *
  * @param $string
  *   String - the mail comment signature
- *   
+ *
  * @return drupal_goto
  */
 function mailcomment_message_redirect($string) {
@@ -876,4 +881,4 @@ function mailcomment_mail_comment_ancestor_message_id($nid, $cid) {
     }
   }
   return '';
-}
\ No newline at end of file
+}