From cf421cbb2dfae44687b302d6b5ad98560f071e31 Mon Sep 17 00:00:00 2001
From: Jackie Luo <jackiehluo@gmail.com>
Date: Mon, 27 Jun 2016 14:58:09 -0700
Subject: [PATCH] Check In-Reply-To instead of References

---
 packages/nylas-message-processor/processors/threading.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/nylas-message-processor/processors/threading.js b/packages/nylas-message-processor/processors/threading.js
index 7af8bbee9..97774c019 100644
--- a/packages/nylas-message-processor/processors/threading.js
+++ b/packages/nylas-message-processor/processors/threading.js
@@ -104,10 +104,9 @@ function cleanSubject(subject) {
   return cleanedSubject
 }
 
-function getThreadFromReferences({db, references}) {
+function getThreadFromHeader({db, inReplyTo}) {
   const {Message} = db
-  const messageId = references.split()[references.length - 1]
-  return Message.find({where: {messageId: messageId}})
+  return Message.find({where: {messageId: inReplyTo}})
   .then((message) => {
     return message.getThread()
   })
@@ -115,8 +114,8 @@ function getThreadFromReferences({db, references}) {
 
 function matchThread({db, accountId, message}) {
   const {Thread} = db
-  if (message.headers.references) {
-    return getThreadFromReferences()
+  if (message.headers['In-Reply-To']) {
+    return getThreadFromHeader({db, inReplyTo: message.headers['In-Reply-To']})
     .then((thread) => {
       if (thread) {
         return thread