diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index f0a897bf8a..1c276062fd 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -320,6 +320,9 @@ public interface DaoMessage {
     @Query("UPDATE message SET folder = :folder WHERE id = :id")
     int setMessageFolder(long id, long folder);
 
+    @Query("UPDATE message SET identity = :identity WHERE id = :id")
+    int setMessageIdentity(long id, Long identity);
+
     @Query("UPDATE message SET uid = :uid WHERE id = :id")
     int setMessageUid(long id, Long uid);
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 7609fd472b..a5eb90b174 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -355,6 +355,7 @@ public class ServiceSend extends LifecycleService {
             try {
                 db.beginTransaction();
 
+                db.message().setMessageIdentity(message.id, null);
                 db.message().setMessageSent(message.id, time);
                 db.message().setMessageReceiptRequested(message.id, ident.delivery_receipt || ident.read_receipt);
                 db.message().setMessageSeen(message.id, true);