diff --git a/app/src/main/java/eu/faircode/email/FragmentLogs.java b/app/src/main/java/eu/faircode/email/FragmentLogs.java
index e0fbed4c0a..3566c3984a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentLogs.java
+++ b/app/src/main/java/eu/faircode/email/FragmentLogs.java
@@ -105,6 +105,17 @@ public class FragmentLogs extends FragmentBase {
         adapter = new AdapterLog(this);
         rvLog.setAdapter(adapter);
 
+        rvLog.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                try {
+                    autoScroll = (llm.findFirstVisibleItemPosition() == 0);
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
+            }
+        });
+
         // Initialize
         grpReady.setVisibility(View.GONE);
         pbWait.setVisibility(View.VISIBLE);
@@ -159,7 +170,6 @@ public class FragmentLogs extends FragmentBase {
         boolean all = (account == null && folder == null && message == null);
 
         menu.findItem(R.id.menu_enabled).setChecked(main_log);
-        menu.findItem(R.id.menu_auto_scroll).setChecked(autoScroll);
         menu.findItem(R.id.menu_show).setVisible(all);
         menu.findItem(R.id.menu_clear).setVisible(all);
 
@@ -174,11 +184,6 @@ public class FragmentLogs extends FragmentBase {
             item.setChecked(enabled);
             onMenuEnable(enabled);
             return true;
-        } else if (itemId == R.id.menu_auto_scroll) {
-            boolean enabled = !item.isChecked();
-            item.setChecked(enabled);
-            onMenuAutoScroll(enabled);
-            return true;
         } else if (itemId == R.id.menu_show) {
             onMenuShow();
         } else if (itemId == R.id.menu_clear) {
@@ -193,10 +198,6 @@ public class FragmentLogs extends FragmentBase {
         prefs.edit().putBoolean("main_log", enabled).apply();
     }
 
-    private void onMenuAutoScroll(boolean enabled) {
-        autoScroll = enabled;
-    }
-
     private void onMenuShow() {
         final Context context = getContext();
 
diff --git a/app/src/main/res/menu/menu_logs.xml b/app/src/main/res/menu/menu_logs.xml
index 3e3e13acf0..769a133689 100644
--- a/app/src/main/res/menu/menu_logs.xml
+++ b/app/src/main/res/menu/menu_logs.xml
@@ -7,12 +7,6 @@
         android:checked="true"
         android:title="@string/title_enabled"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/menu_auto_scroll"
-        android:checkable="true"
-        android:checked="true"
-        android:title="@string/title_auto_scroll"
-        app:showAsAction="never" />
     <item
         android:id="@+id/menu_show"
         android:title="@string/title_unhide"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7b4891204..92e0349938 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1973,7 +1973,6 @@
 
     <string name="title_unexpected_error">Unexpected error</string>
     <string name="title_log">Log</string>
-    <string name="title_auto_scroll">Auto scroll</string>
     <string name="title_log_clear">Clear</string>
     <string name="title_rules_search_hint">Search name or condition</string>
     <string name="title_rules_export">Export rules</string>