diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index f4859f174e..06771f048c 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -95,14 +95,17 @@ public class ViewModelMessages extends ViewModel {
                 continue;
             if (found) {
                 prev = item;
-                list.getValue().loadAround(i);
                 break;
             }
-            if (thread.equals(item.thread))
+            if (thread.equals(item.thread)) {
                 found = true;
-            else
+                list.getValue().loadAround(i);
+            } else
                 next = item;
         }
+        if (!found)
+            return new Target[]{null, null};
+
         return new Target[]{
                 prev == null ? null : new Target(prev.account, prev.thread, prev.id, prev.ui_found),
                 next == null ? null : new Target(next.account, next.thread, next.id, next.ui_found)};