diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
index 05494227c4..07139a1073 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
@@ -124,6 +124,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
     private TextView tvNetworkInfo;
 
     private Group grpValidated;
+    private Group grpCustomDns;
     private Group grpCustomSsl;
 
     private final static List<String> RESET_OPTIONS = Collections.unmodifiableList(Arrays.asList(
@@ -194,6 +195,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
         tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo);
 
         grpValidated = view.findViewById(R.id.grpValidated);
+        grpCustomDns = view.findViewById(R.id.grpCustomDns);
         grpCustomSsl = view.findViewById(R.id.grpCustomSsl);
 
         setOptions();
@@ -642,6 +644,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
         FragmentDialogTheme.setBackground(getContext(), view, false);
         tvNetworkMetered.setVisibility(View.GONE);
         tvNetworkRoaming.setVisibility(View.GONE);
+        grpCustomDns.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
         grpCustomSsl.setVisibility(SSLHelper.customTrustManager() ? View.VISIBLE : View.GONE);
         cardDebug.setVisibility(View.GONE);
 
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index d47878a2ca..51e9362105 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -720,6 +720,13 @@
                     android:layout_height="0dp"
                     app:constraint_referenced_ids="swValidated,tvValidatedHint,swVpnOnly" />
 
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpCustomDns"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="
+                    swDnsCustom,tvDnsExtra,etDnsExtra" />
+
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/grpCustomSsl"
                     android:layout_width="0dp"