diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 291d400d84..2bb323d9c2 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -91,7 +91,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         @Override
                         public void run() {
                             Log.i(Helper.TAG, "Boundary close");
-                            DB.getInstance(context).message().deleteFoundMessages();
                             try {
                                 if (istore != null)
                                     istore.close();
@@ -207,11 +206,13 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                 try {
                                     long uid = ifolder.getUID(isub[j]);
                                     Log.i(Helper.TAG, "Boundary sync uid=" + uid);
-                                    if (db.message().getMessageByUid(fid, uid) == null) {
+                                    EntityMessage message = db.message().getMessageByUid(fid, uid);
+                                    if (message == null) {
                                         ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], search != null);
                                         count++;
                                         loaded++;
-                                    }
+                                    } else
+                                        db.message().setMessageFound(message.id, true);
                                 } catch (MessageRemovedException ex) {
                                     Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
                                 } catch (FolderClosedException ex) {
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 0f4dbc09b0..e7d03885f6 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -241,7 +241,4 @@ public interface DaoMessage {
 
     @Query("DELETE FROM message WHERE folder = :folder AND received < :received AND NOT uid IS NULL")
     int deleteMessagesBefore(long folder, long received);
-
-    @Query("DELETE FROM message WHERE ui_found")
-    int deleteFoundMessages();
 }
\ No newline at end of file