diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fbd2a9cfbb..0536ce6006 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3188,35 +3188,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     };
 
     private Observer<PagedList<TupleMessageEx>> observer = new Observer<PagedList<TupleMessageEx>>() {
-        private List<Long> ids = new ArrayList<>();
-
         @Override
         public void onChanged(@Nullable PagedList<TupleMessageEx> messages) {
             if (messages == null)
                 return;
 
-            if (viewType == AdapterMessage.ViewType.THREAD) {
+            if (viewType == AdapterMessage.ViewType.THREAD)
                 if (handleThreadActions(messages))
                     return;
 
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-                boolean autoscroll = prefs.getBoolean("autoscroll", true);
-                if (autoscroll) {
-                    boolean gotoTop = false;
-                    for (int i = 0; i < messages.size(); i++) {
-                        TupleMessageEx message = messages.get(i);
-                        if (message != null && !ids.contains(message.id)) {
-                            ids.add(message.id);
-                            if (!message.ui_seen && !message.duplicate)
-                                gotoTop = true;
-                        }
-                    }
-
-                    if (gotoTop)
-                        adapter.gotoTop();
-                }
-            }
-
             Log.i("Submit messages=" + messages.size());
             adapter.submitList(messages);