diff --git a/briar-android/src/main/res/layout/fragment_conversation_settings.xml b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
index 377282d71..aa1abab35 100644
--- a/briar-android/src/main/res/layout/fragment_conversation_settings.xml
+++ b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
@@ -10,9 +10,7 @@
 		android:layout_width="64dp"
 		android:layout_height="64dp"
 		android:layout_marginTop="16dp"
-		android:layout_marginBottom="8dp"
 		android:src="@drawable/ic_bomb"
-		app:layout_constraintBottom_toBottomOf="@+id/barrier"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
@@ -38,7 +36,7 @@
 
 	<TextView
 		android:id="@+id/headlineSetting"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:text="@string/disappearing_messages_title"
 		android:textStyle="bold"
@@ -50,6 +48,7 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:text="@string/disappearing_messages_summary"
+		app:layout_constraintBottom_toTopOf="@id/barrier"
 		app:layout_constraintEnd_toStartOf="@id/switchDisappearingMessages"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/headlineSetting" />
@@ -58,9 +57,15 @@
 		android:id="@+id/switchDisappearingMessages"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintBottom_toTopOf="@id/barrier"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/textSetting"
 		app:layout_constraintTop_toBottomOf="@+id/buttonLearnMore" />
 
+	<androidx.constraintlayout.widget.Barrier
+		android:id="@+id/barrier"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		app:barrierDirection="top" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file