Tokens with pictures / alpha-block placeholders and names shown when composing messages should be optional

Expected behaviour

general/display correspondent display settings -- email address and pictures -- should be respected.

1 - when composing a message, correspondent email address should be displayed (when the general/display setting for showing correspondent name is unchecked), not their name (from the addressbook)

2 - the correspondent picture (or alpha block placeholder) should not be displayed if the general/display setting "show contact picture" is unchecked.

Actual behaviour

when
if correspondent is in addressbook, the addressbook name is displayed.

the correspondent's picture (or if one doesn't exist, a placeholder alpha block) is displayed

Steps to reproduce

1.originate a message
2.enter a correspondent's email address
3.if in addressbook, contact name and picture (or alpha block if no picture or not in addressbook) will be displayed.

Environment

K-9 Mail version:5.108

Android version:6.0.1 (but this doesn't matter)

Account type (IMAP, POP3, WebDAV/Exchange):imap

in general/display settings, "show correspondent names, rather than email addresses" and "show contact pictures" are both unchecked.

Start at the message-composition correspondent entry point and trace how the general display settings are applied to contact names, email addresses, pictures, and alpha-block placeholders. Reproduce the issue with both display settings unchecked; it is done when composing a message respects each setting independently.