diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a1ba0a5b9d..13b0e9a1a0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3339,7 +3339,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             cur++;
                     }
 
-                if (gotoTop || cur > prev) {
+                if (gotoTop ||
+                        (previousList != null && currentList != null && cur > prev)) {
                     gotoTop = false;
                     properties.scrollTo(0);
                 }