diff --git a/mailcomment.module b/mailcomment.module
index 7ba3b96..9e5445b 100644
--- a/mailcomment.module
+++ b/mailcomment.module
@@ -395,8 +395,8 @@ function mailcomment_source_get_source($source, FeedsParserResult $result, $key)
   if (!$identifier) {
     // Failed to find signature in body -- replicate mailhandler functionality to find node->threading.
     if (!empty($item['header']->references)) {
-      // We want the final element in references header, watching out for white space.
-      $identifier = drupal_substr(strrchr($item['header']->references, '<'), 0);
+      // we want the first element in references header, watching out for white space
+      $identifier = ltrim(trim(strstr($item['header']->references, '>', TRUE)), '<');
     }
     elseif (!empty($item['header']->in_reply_to)) {
       // Some MUAs send more info in this header.
