diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ac6fcc09bc..e6b3bdb611 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1298,8 +1298,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (viewType == ViewType.THREAD)
                 if (expanded)
                     bindExpanded(message, scroll);
-                else
+                else {
                     clearExpanded(message);
+                    if (scroll)
+                        properties.scrollTo(getAdapterPosition(), 0);
+                }
 
             if (properties.getValue("raw_save", message.id)) {
                 properties.setValue("raw_save", message.id, false);
@@ -4813,7 +4816,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             (autoclose_unseen || getItemCount() == 1))
                         properties.finish();
                     else
-                        properties.setExpanded(message, false, false);
+                        properties.setExpanded(message, false, true);
                 }
 
                 @Override