diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index f94e5aaec0..87b0da0053 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -320,7 +320,9 @@ public class ViewModelMessages extends ViewModel {
                             for (int j = 0; j < messages.size(); j++)
                                 if (messages.get(j).id == id) {
                                     int pos = i + j;
-                                    model.list.getValue().loadAround(pos);
+
+                                    if (pos < plist.size())
+                                        plist.loadAround(pos);
 
                                     List<TupleMessageEx> lprev = null;
                                     if (pos - 1 >= 0)