diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 18922463be..8ea0f9c88a 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -257,7 +257,8 @@ public interface DaoMessage {
     @Query("SELECT uid FROM message" +
             " WHERE folder = :folder" +
             " AND (:received IS NULL OR received >= :received)" +
-            " AND NOT uid IS NULL")
+            " AND NOT uid IS NULL" +
+            " AND NOT ui_browsed")
     List<Long> getUids(long folder, Long received);
 
     @Query("SELECT * FROM message WHERE NOT ui_snoozed IS NULL")
@@ -352,7 +353,8 @@ public interface DaoMessage {
 
     @Query("DELETE FROM message" +
             " WHERE folder = :folder" +
-            " AND uid IS NULL")
+            " AND uid IS NULL" +
+            " AND NOT ui_browsed")
     int deleteOrphans(long folder);
 
     @Query("DELETE FROM message" +
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 29c2adff6b..45ca6a5492 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1840,7 +1840,6 @@ public class ServiceSynchronize extends LifecycleService {
                         db.message().setMessageSent(sid, imessage.getSentDate().getTime());
                         db.message().setMessageUiHide(sid, false);
                         db.message().deleteMessage(message.id);
-                        //EntityOperation.queue(this, db, message, EntityOperation.ADD);
                     }
 
                     db.setTransactionSuccessful();