diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index b2aab1bb44..136bccbdab 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -247,6 +247,8 @@ public class ApplicationEx extends Application {
             if (!prefs.contains("poll_interval"))
                 editor.putInt("poll_interval", 0);
             editor.remove("first");
+        } else if (version < 999) {
+            editor.remove("actionbar");
         }
 
         if (BuildConfig.DEBUG && false) {
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 1c99ee0d44..93447c8ca6 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -730,6 +730,7 @@
             android:layout_marginTop="12dp"
             android:checked="true"
             android:text="@string/title_advanced_actionbar"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/swSeekbar"