diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
index 07139a1073..ac34b56752 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
@@ -125,6 +125,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
 
     private Group grpValidated;
     private Group grpCustomDns;
+    private Group grpBC;
     private Group grpCustomSsl;
 
     private final static List<String> RESET_OPTIONS = Collections.unmodifiableList(Arrays.asList(
@@ -196,6 +197,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
 
         grpValidated = view.findViewById(R.id.grpValidated);
         grpCustomDns = view.findViewById(R.id.grpCustomDns);
+        grpBC = view.findViewById(R.id.grpBC);
         grpCustomSsl = view.findViewById(R.id.grpCustomSsl);
 
         setOptions();
@@ -645,6 +647,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
         tvNetworkMetered.setVisibility(View.GONE);
         tvNetworkRoaming.setVisibility(View.GONE);
         grpCustomDns.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
+        grpBC.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 51e9362105..4357653c41 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -727,6 +727,13 @@
                     app:constraint_referenced_ids="
                     swDnsCustom,tvDnsExtra,etDnsExtra" />
 
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpBC"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="
+                    swBouncyCastle,swFipsMode,ibBouncyCastle" />
+
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/grpCustomSsl"
                     android:layout_width="0dp"