diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 2ab3e88f68..bb3ee70207 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -278,7 +278,9 @@ public class FragmentOptions extends FragmentBase {
             }
 
             private int getSuggestions(String query, int id, int tab, String title, View view, MatrixCursor cursor) {
-                if (view instanceof ViewGroup) {
+                if (view == null || "debug".equals(view.getTag()))
+                    return id;
+                else if (view instanceof ViewGroup) {
                     ViewGroup group = (ViewGroup) view;
                     for (int i = 0; i <= group.getChildCount(); i++)
                         id = getSuggestions(query, id, tab, title, group.getChildAt(i), cursor);
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index ea7bc96b80..48ab2829f6 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -322,6 +322,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
+                    android:tag="debug"
                     android:text="@string/title_advanced_standalone_vpn"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -333,6 +334,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
+                    android:tag="debug"
                     android:text="@string/title_advanced_tcp_keep_alive"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 147e861cb4..844cca8015 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -515,6 +515,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="3dp"
             android:layout_marginTop="12dp"
+            android:tag="debug"
             app:cardBackgroundColor="?attr/colorCardBackground"
             app:cardCornerRadius="6dp"
             app:cardElevation="0dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49605d0f8f..3f9d18de91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -352,8 +352,8 @@
     <string name="title_advanced_validated">Require a validated (checked) connection</string>
     <string name="title_advanced_timeout">Connection timeout (seconds)</string>
     <string name="title_advanced_prefer_ip4">Prefer IPv4 over IPv6</string>
-    <string name="title_advanced_standalone_vpn" translatable="false">Standalone VPN (debug only)</string>
-    <string name="title_advanced_tcp_keep_alive" translatable="false">TCP keep alive (debug only)</string>
+    <string name="title_advanced_standalone_vpn" translatable="false">Standalone VPN</string>
+    <string name="title_advanced_tcp_keep_alive" translatable="false">TCP keep alive</string>
     <string name="title_advanced_ssl_harden">Harden SSL connections</string>
     <string name="title_advanced_manage_connectivity">Manage connectivity</string>
 
@@ -557,14 +557,14 @@
     <string name="title_advanced_log_info">Debug logging</string>
     <string name="title_advanced_debug">Debug mode</string>
     <string name="title_advanced_query_threads">Limit parallel database access</string>
-    <string name="title_advanced_wal" translatable="false">WAL (debug only)</string>
-    <string name="title_advanced_modseq" translatable="false">MODSEQ (debug only)</string>
-    <string name="title_advanced_expunge" translatable="false">EXPUNGE (debug only)</string>
-    <string name="title_advanced_auth_plain" translatable="false">PLAIN (debug only)</string>
-    <string name="title_advanced_auth_login" translatable="false">LOGIN (debug only)</string>
-    <string name="title_advanced_auth_ntlm" translatable="false">NTLM (debug only)</string>
-    <string name="title_advanced_auth_sasl" translatable="false">SASL (debug only)</string>
-    <string name="title_advanced_exact_alarms" translatable="false">Use exact timers (debug only)</string>
+    <string name="title_advanced_wal" translatable="false">WAL</string>
+    <string name="title_advanced_modseq" translatable="false">MODSEQ</string>
+    <string name="title_advanced_expunge" translatable="false">EXPUNGE</string>
+    <string name="title_advanced_auth_plain" translatable="false">PLAIN</string>
+    <string name="title_advanced_auth_login" translatable="false">LOGIN</string>
+    <string name="title_advanced_auth_ntlm" translatable="false">NTLM</string>
+    <string name="title_advanced_auth_sasl" translatable="false">SASL</string>
+    <string name="title_advanced_exact_alarms" translatable="false">Use exact timers</string>
     <string name="title_advanced_processors" translatable="false">Processors: %1$d</string>
     <string name="title_advanced_memory_class" translatable="false">Memory class: %1$s/%2$s Total: %3$s</string>
     <string name="title_advanced_memory_usage" translatable="false">Memory usage: %1$s/%2$s Native: %3$s</string>