diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ada54ff9d1..fe61b865bf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1638,6 +1638,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         bindBody(message, false);
 
                     bindAttachments(message, attachments, true);
+
+                    if (!scroll)
+                        properties.ready(message.id);
                 }
             });
 
@@ -6239,6 +6242,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         void scrollBy(int x, int y);
 
+        void ready(long id);
+
         void move(long id, String type);
 
         void reply(TupleMessageEx message, String selected, View anchor);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index b42fcf291a..c867a5e09a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -761,6 +761,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 this, type, found, viewType,
                 compact, zoom, sort, ascending, filter_duplicates,
                 iProperties);
+        adapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT);
         rvMessage.setAdapter(adapter);
 
         sbThread.setOnTouchListener(new View.OnTouchListener() {
@@ -1773,6 +1774,29 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             });
         }
 
+        @Override
+        public void ready(long id) {
+            iProperties.setValue("ready", id, true);
+
+            if (!values.containsKey("expanded"))
+                return;
+
+            for (long expanded : values.get("expanded"))
+                if (!iProperties.getValue("ready", expanded))
+                    return;
+
+            getMainHandler().post(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        adapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.ALLOW);
+                    } catch (Throwable ex) {
+                        Log.e(ex);
+                    }
+                }
+            });
+        }
+
         @Override
         public void move(long id, String type) {
             Bundle args = new Bundle();
@@ -3672,11 +3696,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (rvMessage != null) {
             Parcelable rv = rvMessage.getLayoutManager().onSaveInstanceState();
             outState.putParcelable("fair:rv", rv);
-
-            LinearLayoutManager llm = (LinearLayoutManager) rvMessage.getLayoutManager();
-            outState.putInt("fair:scroll", llm.findFirstVisibleItemPosition());
         }
 
+        values.remove("ready");
+
         if (selectionTracker != null)
             selectionTracker.onSaveInstanceState(outState);
 
@@ -3704,8 +3727,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 rvMessage.getLayoutManager().onRestoreInstanceState(rv);
             }
 
-            adapter.gotoPos(savedInstanceState.getInt("fair:scroll"));
-
             if (selectionTracker != null)
                 selectionTracker.onRestoreInstanceState(savedInstanceState);
         }