diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 6157eff4e3..fb96ee4c44 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -163,6 +163,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private int load_device(State state) {
         DB db = DB.getInstance(context);
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean threading = prefs.getBoolean("threading", true);
+
         Boolean seen = null;
         Boolean flagged = null;
         Boolean snoozed = null;
@@ -229,7 +232,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
 
                     if (match.matched != null && match.matched) {
                         found++;
-                        db.message().setMessageFound(match.account, match.thread);
+                        if (threading)
+                            db.message().setMessageFound(match.account, match.thread);
+                        else
+                            db.message().setMessageFound(match.id);
                     }
                 }
             }
@@ -249,6 +255,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private int load_server(State state) throws MessagingException, IOException {
         DB db = DB.getInstance(context);
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean threading = prefs.getBoolean("threading", true);
+        boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
+
         final EntityFolder browsable = db.folder().getBrowsableFolder(folder, query != null);
         if (browsable == null)
             return 0;
@@ -263,9 +273,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 if (!ConnectionHelper.getNetworkState(context).isSuitable())
                     throw new IllegalStateException(context.getString(R.string.title_no_internet));
 
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
-
                 Log.i("Boundary server connecting account=" + account.name);
                 state.iservice = new MailService(context, account.getProtocol(), account.realm, account.insecure, false, debug);
                 state.iservice.setPartialFetch(account.partial_fetch);
@@ -473,7 +480,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             found++;
                         }
                         if (message != null)
-                            db.message().setMessageFound(message.account, message.thread);
+                            if (threading)
+                                db.message().setMessageFound(message.account, message.thread);
+                            else
+                                db.message().setMessageFound(message.id);
                     } catch (MessageRemovedException ex) {
                         Log.w(browsable.name + " boundary server", 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 6d16acda2d..79c048b2fa 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -487,6 +487,9 @@ public interface DaoMessage {
             "  WHERE (:folder IS NULL AND folder.unified) OR id = :folder)")
     int ignoreAll(Long account, Long folder);
 
+    @Query("UPDATE message SET ui_found = 1 WHERE id = :id")
+    int setMessageFound(long id);
+
     @Query("UPDATE message SET ui_found = 1" +
             " WHERE account = :account" +
             " AND thread = :thread")