diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 5297d0a888..723fb7ee03 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -164,6 +164,16 @@ public class ApplicationEx extends Application {
             }
         }
 
+
+        if (BuildConfig.DEBUG && false) {
+            editor.remove("app_support");
+            editor.remove("notify_archive");
+            editor.remove("message_swipe");
+            editor.remove("message_select");
+            editor.remove("folder_actions");
+            editor.remove("folder_sync");
+        }
+
         editor.putInt("version", BuildConfig.VERSION_CODE);
 
         editor.apply();
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index e84dcb9b0a..7111962750 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -71,8 +71,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
     private final static String[] RESET_QUESTIONS = new String[]{
             "welcome", "crash_reports_asked",
-            "app_support", "notify_archive", "message_swipe", "message_select",
-            "folder_actions", "folder_sync",
             "show_html_confirmed", "print_html_confirmed",
             "identities_asked", "edit_ref_confirmed", "delete_ref_confirmed"
     };