From 17f920fb90d6100a8091e29ed3ee15a073a5b1d3 Mon Sep 17 00:00:00 2001
From: Annie <annie@nylas.com>
Date: Tue, 12 Jul 2016 18:31:30 -0700
Subject: [PATCH] Ordered inbox messages chronologically

---
 packages/nylas-message-processor/processors/contact.js   | 3 +--
 packages/nylas-message-processor/processors/threading.js | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/nylas-message-processor/processors/contact.js b/packages/nylas-message-processor/processors/contact.js
index 38397e60a..f4a984cbb 100644
--- a/packages/nylas-message-processor/processors/contact.js
+++ b/packages/nylas-message-processor/processors/contact.js
@@ -27,9 +27,8 @@ class ContactProcessor {
   }
 
 
-  processMessage({db, message, logger}) {
+  processMessage({db, message}) {
     const {Contact} = db;
-    this.logger = logger
 
     let allContacts = []
     const fields = ['to', 'from', 'bcc', 'cc']
diff --git a/packages/nylas-message-processor/processors/threading.js b/packages/nylas-message-processor/processors/threading.js
index 2f9c847fd..02d6b7ff9 100644
--- a/packages/nylas-message-processor/processors/threading.js
+++ b/packages/nylas-message-processor/processors/threading.js
@@ -77,7 +77,6 @@ class ThreadingProcessor {
       throw new Error("Threading processMessage expects folder value to be present.");
     }
 
-    this.logger = logger
 
     const {Folder, Label} = db;
     let findOrCreateThread = null;
@@ -140,13 +139,12 @@ class ThreadingProcessor {
         isSent = !!message.labels.find(l => l.id === sentLabel.id)
       }
 
-      if (isSent && (message.date > thread.lastMessageSentDate)) {
+      if (isSent && ((message.date > thread.lastMessageSentDate) || !thread.lastMessageSentDate)) {
         thread.lastMessageSentDate = message.date;
       }
-      if (!isSent && (message.date > thread.lastMessageReceivedDate)) {
+      if (!isSent && ((message.date > thread.lastMessageReceivedDate) || !thread.lastMessageReceivedDate)) {
         thread.lastMessageReceivedDate = message.date;
       }
-
       // update folders and labels
       if (!thread.folders.find(f => f.id === message.folderId)) {
         thread.addFolder(message.folder)