diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index affc108242..b96a42a2b7 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -941,6 +941,8 @@ class Core {
                     orphan.folder = folder.id;
                     db.message().updateMessage(orphan);
                     EntityOperation.queue(context, db, orphan, EntityOperation.ADD);
+
+                    db.identity().setIdentityStoreSent(orphan.identity, true);
                 }
             }
 
diff --git a/app/src/main/java/eu/faircode/email/DaoIdentity.java b/app/src/main/java/eu/faircode/email/DaoIdentity.java
index 6320ddfb65..a8f6d1d1bd 100644
--- a/app/src/main/java/eu/faircode/email/DaoIdentity.java
+++ b/app/src/main/java/eu/faircode/email/DaoIdentity.java
@@ -77,6 +77,9 @@ public interface DaoIdentity {
     @Query("UPDATE identity SET password = :password WHERE id = :id")
     int setIdentityPassword(long id, String password);
 
+    @Query("UPDATE identity SET store_sent = :store_sent WHERE id = :id")
+    int setIdentityStoreSent(long id, boolean store_sent);
+
     @Query("UPDATE identity SET error = :error WHERE id = :id")
     int setIdentityError(long id, String error);