diff --git a/app/src/main/java/eu/faircode/email/FragmentLogs.java b/app/src/main/java/eu/faircode/email/FragmentLogs.java
index 7859750884..1b51271b82 100644
--- a/app/src/main/java/eu/faircode/email/FragmentLogs.java
+++ b/app/src/main/java/eu/faircode/email/FragmentLogs.java
@@ -21,6 +21,9 @@ package eu.faircode.email;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
@@ -41,12 +44,14 @@ public class FragmentLogs extends FragmentEx {
     private ProgressBar pbWait;
     private Group grpReady;
 
+    private boolean autoScroll = true;
     private AdapterLog adapter;
 
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         setSubtitle(R.string.title_log);
+        setHasOptionsMenu(true);
 
         View view = inflater.inflate(R.layout.fragment_logs, container, false);
 
@@ -85,11 +90,37 @@ public class FragmentLogs extends FragmentEx {
                     logs = new ArrayList<>();
 
                 adapter.set(logs);
-                //rvLog.scrollToPosition(0);
+                if (autoScroll)
+                    rvLog.scrollToPosition(0);
 
                 pbWait.setVisibility(View.GONE);
                 grpReady.setVisibility(View.VISIBLE);
             }
         });
     }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_logs, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        menu.findItem(R.id.menu_auto_scroll).setChecked(autoScroll);
+        super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_auto_scroll:
+                autoScroll = !item.isChecked();
+                item.setChecked(autoScroll);
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
diff --git a/app/src/main/res/menu/menu_logs.xml b/app/src/main/res/menu/menu_logs.xml
new file mode 100644
index 0000000000..1fdd5559af
--- /dev/null
+++ b/app/src/main/res/menu/menu_logs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_auto_scroll"
+        android:checkable="true"
+        android:title="@string/title_auto_scroll"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca4ea17da0..182462b54d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -376,6 +376,7 @@
 
     <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_debug_info">Debug info</string>
     <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
     <string name="title_crash_info_remark">Please describe what you were doing when the app crashed:</string>