diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b1c60b9c20..75bee8fe2c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3068,8 +3068,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         EntityOperation.queue(context, message, EntityOperation.ADD);
 
                         // Delete from outbox
-                        db.operation().deleteOperation(id, EntityOperation.SEND);
-                        db.message().deleteMessage(id);
+                        db.message().deleteMessage(id); // will delete operation too
 
                         db.setTransactionSuccessful();
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index 655bd7f1c2..a20012791b 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -104,9 +104,4 @@ public interface DaoOperation {
 
     @Query("DELETE FROM operation WHERE id = :id")
     int deleteOperation(long id);
-
-    @Query("DELETE FROM operation" +
-            " WHERE message = :message" +
-            " AND name = :name")
-    int deleteOperation(long message, String name);
 }