from_addr = add_recipients_from_message (reply, config, message);
- if (from_addr == NULL) {
+ if (from_addr == NULL)
from_addr = guess_from_received_header (config, message);
- if (from_addr == NULL) {
- from_addr = notmuch_config_get_user_primary_email (config);
- }
- }
+
+ if (from_addr == NULL) {
+ from_addr = notmuch_config_get_user_primary_email (config);
from_addr = talloc_asprintf (ctx, "%s <%s>",
notmuch_config_get_user_name (config),