diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index e2a48b4010..1cffa72189 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -558,16 +558,6 @@ public class EntityOperation {
                     return;
                 }
 
-                if (EXISTS.equals(name)) {
-                    EntityFolder f = db.folder().getFolder(folder);
-                    EntityMessage m = db.message().getMessage(message);
-                    if (f != null && m != null) {
-                        Log.i("POP3: inline EXISTS");
-                        EntityContact.received(context, a, f, m);
-                        return;
-                    }
-                }
-
                 if (DELETE.equals(name)) {
                     EntityFolder f = db.folder().getFolder(folder);
                     if (f != null &&
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 3551ec7d84..7d05f69fcf 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -858,7 +858,10 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 // Message could have been deleted
                 EntityMessage orphan = db.message().getMessage(sid);
                 if (orphan != null)
-                    EntityOperation.queue(this, orphan, EntityOperation.EXISTS);
+                    if (account == null || account.protocol == EntityAccount.TYPE_IMAP)
+                        EntityOperation.queue(this, orphan, EntityOperation.EXISTS);
+                    else if (sent != null)
+                        EntityContact.received(this, account, sent, message);
 
                 db.setTransactionSuccessful();
             } finally {