From e1d104f8bade88f1fb31b48f272a6f91043de2c3 Mon Sep 17 00:00:00 2001
From: Greg Anderson <greg.1.anderson@greenknowe.org>
Date: Sat, 15 Aug 2015 11:17:44 -0700
Subject: [PATCH] Fixes #693: findIdentityByMessage gives too great a weight to
 the default identity. Only test the 'Delivered-To' header if no other header
 contained a matching identity, as 'Delivered-To' will usually contain the
 default identity.

---
 dev/View/Popup/Compose.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 4e588b2ec..9d50057dc 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -696,7 +696,10 @@
 				case Enums.ComposeType.ReplyAll:
 				case Enums.ComposeType.Forward:
 				case Enums.ComposeType.ForwardAsAttachment:
-					_.each(_.union(oMessage.to, oMessage.cc, oMessage.bcc, oMessage.deliveredTo), fEachHelper);
+					_.each(_.union(oMessage.to, oMessage.cc, oMessage.bcc), fEachHelper);
+					if (!oResultIdentity) {
+						_.each(oMessage.deliveredTo, fEachHelper);
+					}
 					break;
 				case Enums.ComposeType.Draft:
 					_.each(_.union(oMessage.from, oMessage.replyTo), fEachHelper);
@@ -2183,4 +2186,4 @@
 
 	module.exports = ComposePopupView;
 
-}());
\ No newline at end of file
+}());