diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index 2f4b1a0ce..d6fae3dce 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -322,7 +322,7 @@ fn add_parts(
         } else {
             MessageState::InFresh
         };
-        to_id = to_ids.get_index(0).cloned().unwrap_or_default();
+        to_id = DC_CONTACT_ID_SELF;
         let mut needs_stop_ongoing_process = false;
 
         // handshake messages must be processed _before_ chats are created
@@ -458,7 +458,7 @@ fn add_parts(
         // the mail is on the IMAP server, probably it is also delivered.
         // We cannot recreate other states (read, error).
         state = MessageState::OutDelivered;
-        to_id = DC_CONTACT_ID_SELF;
+        to_id = to_ids.get_index(0).cloned().unwrap_or_default();
         if !to_ids.is_empty() {
             if *chat_id == 0 {
                 let (new_chat_id, new_chat_id_blocked) = create_or_lookup_group(