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.

This commit is contained in:
Greg Anderson 2015-08-15 11:17:44 -07:00
parent 2a7d8ccab8
commit e1d104f8ba

View file

@ -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;
}());
}());