diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index 6b40414883..4f3fe77b5a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -587,8 +587,13 @@ public class FragmentContacts extends FragmentBase {
                 EntityContact contact;
                 if (id > 0)
                     contact = db.contact().getContact(id);
-                else
-                    contact = new EntityContact();
+                else {
+                    contact = db.contact().getContact(account, type, email);
+                    if (contact == null)
+                        contact = new EntityContact();
+                    else
+                        id = contact.id;
+                }
 
                 contact.account = account;
                 contact.type = type;