diff --git a/src/receive_imf.rs b/src/receive_imf.rs
index 86d1577ac..4f4cc60e8 100644
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -414,8 +414,7 @@ async fn get_to_and_past_contact_ids(
                     }
                     false => vec![],
                 };
-                if chat_id.is_some()
-                || (mime_parser.was_encrypted() && !ids.contains(&None))
+                if mime_parser.was_encrypted() && !ids.contains(&None)
                 // Prefer creating PGP chats if there are any key-contacts. At least this prevents
                 // from replying unencrypted.
                 || ids