diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 31feec16fa..440ff03e86 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -239,6 +239,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private Group grpVirusTotal;
     private Group grpSend;
     private Group grpUpdates;
+    private Group grpBitbucket;
     private Group grpTest;
     private CardView cardDebug;
 
@@ -455,6 +456,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         grpVirusTotal = view.findViewById(R.id.grpVirusTotal);
         grpSend = view.findViewById(R.id.grpSend);
         grpUpdates = view.findViewById(R.id.grpUpdates);
+        grpBitbucket = view.findViewById(R.id.grpBitbucket);
         grpTest = view.findViewById(R.id.grpTest);
         cardDebug = view.findViewById(R.id.cardDebug);
 
@@ -1912,6 +1914,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         grpUpdates.setVisibility(!BuildConfig.DEBUG &&
                 (Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(getContext()))
                 ? View.GONE : View.VISIBLE);
+        grpBitbucket.setVisibility(View.GONE);
         grpTest.setVisibility(BuildConfig.TEST_RELEASE ? View.VISIBLE : View.GONE);
 
         setLastCleanup(prefs.getLong("last_cleanup", -1));
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 2b852a6528..5cdbb14908 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -622,7 +622,6 @@
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:text="@string/title_advanced_beta"
-                    android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/swWeekly"
@@ -779,7 +778,13 @@
                     android:id="@+id/grpUpdates"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="swUpdates,tvGithubPrivacy,swWeekly,swBeta,tvBitBucketPrivacy" />
+                    app:constraint_referenced_ids="swUpdates,tvGithubPrivacy,swWeekly" />
+
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpBitbucket"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="swBeta,tvBitBucketPrivacy" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>