From 27b51cbe90f3484791eeb459a77e2565a500b693 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Sat, 9 Sep 2017 11:20:10 -0700 Subject: [PATCH] Fix toggling between reply and reply-all --- app/src/flux/stores/draft-factory.coffee | 2 +- app/src/flux/stores/message-store.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/flux/stores/draft-factory.coffee b/app/src/flux/stores/draft-factory.coffee index 7f7306ca2..483b4394d 100644 --- a/app/src/flux/stores/draft-factory.coffee +++ b/app/src/flux/stores/draft-factory.coffee @@ -166,7 +166,7 @@ class DraftFactory getMessages.then (messages) => candidateDrafts = messages.filter (other) => - other.replyToHeaderMessageId is message.id and other.draft is true + other.replyToHeaderMessageId is message.headerMessageId and other.draft is true if candidateDrafts.length is 0 return Promise.resolve(null) diff --git a/app/src/flux/stores/message-store.coffee b/app/src/flux/stores/message-store.coffee index 497ff74b4..e96508dea 100644 --- a/app/src/flux/stores/message-store.coffee +++ b/app/src/flux/stores/message-store.coffee @@ -291,7 +291,7 @@ class MessageStore extends NylasStore # the message which it was in reply to. If we can't find it, put it at the end. for item in itemsInReplyTo for other, index in items - if item.replyToHeaderMessageId is other.id + if item.replyToHeaderMessageId is other.headerMessageId items.splice(index+1, 0, item) item = null break