From 1468f67b9b178ea2a6a7562ee7bb9db343cd38b2 Mon Sep 17 00:00:00 2001
From: Alexander Krotov <ilabdsf@gmail.com>
Date: Sun, 29 Dec 2019 04:04:18 +0100
Subject: [PATCH] Warn about multiple From addresses only when necessary

The message says "only using first" so it should be printed right before the first address is taken with .get_index(0) operation.
---
 src/dc_receive_imf.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index a02f0d587..f8996dfbd 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -112,17 +112,17 @@ pub fn dc_receive_imf(
             &field_from,
             Origin::IncomingUnknownFrom,
         )?;
-        if from_ids.len() > 1 {
-            warn!(
-                context,
-                "mail has more than one From address, only using first: {:?}", field_from
-            );
-        }
         if from_ids.contains(&DC_CONTACT_ID_SELF) {
             incoming = false;
             from_id = DC_CONTACT_ID_SELF;
             incoming_origin = Origin::OutgoingBcc;
         } else if !from_ids.is_empty() {
+            if from_ids.len() > 1 {
+                warn!(
+                    context,
+                    "mail has more than one From address, only using first: {:?}", field_from
+                );
+            }
             from_id = from_ids.get_index(0).cloned().unwrap_or_default();
             if let Ok(contact) = Contact::load_from_db(context, from_id) {
                 incoming_origin = contact.origin;