diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5ec9dd4d7d..84e2bce8f6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1539,6 +1539,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     }
             }
 
+            if (value)
+                scrolling = false;
+
             updateExpanded();
             if (value)
                 handleExpand(message.id);