Changed order of address matching

This commit is contained in:
M66B 2020-02-07 20:42:13 +01:00
parent befb18dc23
commit 2274d4870e
2 changed files with 4 additions and 4 deletions

4
FAQ.md
View File

@ -1078,8 +1078,8 @@ Note that this is independent of receiving messages.
**(34) How are identities matched?**
Identities are as expected matched by account.
For incoming messages the *to*, *cc*, *bcc*, *from* and *(X-)delivered/envelope/original-to* addresses will be checked
and for outgoing messages (drafts, outbox and sent) the *from* addresses will be checked.
For incoming messages the *to*, *cc*, *bcc*, *(X-)delivered/envelope/original-to* and *from* addresses will be checked (in this order)
and for outgoing messages (drafts, outbox and sent) only the *from* addresses will be checked.
The matched address will be shown as *via* in the addresses section.

View File

@ -2433,14 +2433,14 @@ class Core {
addresses.addAll(Arrays.asList(message.cc));
if (message.bcc != null)
addresses.addAll(Arrays.asList(message.bcc));
if (message.from != null)
addresses.addAll(Arrays.asList(message.from));
if (message.deliveredto != null)
try {
addresses.add(new InternetAddress(message.deliveredto));
} catch (AddressException ex) {
Log.w(ex);
}
if (message.from != null)
addresses.addAll(Arrays.asList(message.from));
}
// Search for matching identity