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 a01e272aa..262bb1da7 100644
--- a/briar-android/src/main/res/layout/fragment_conversation_settings.xml
+++ b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
@@ -1,71 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="match_parent"
 	android:paddingHorizontal="@dimen/margin_large">
 
-	<ImageView
-		android:id="@+id/imageViewBomb"
-		android:layout_width="64dp"
-		android:layout_height="64dp"
-		android:layout_marginTop="16dp"
-		android:src="@drawable/ic_bomb"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:tint="?attr/colorControlNormal" />
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-	<TextView
-		android:id="@+id/textViewExplanation"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/disappearing_messages_explanation_short"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageViewBomb" />
+		<ImageView
+			android:id="@+id/imageViewBomb"
+			android:layout_width="64dp"
+			android:layout_height="64dp"
+			android:layout_marginTop="16dp"
+			android:src="@drawable/ic_bomb"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:tint="?attr/colorControlNormal" />
 
-	<Button
-		android:id="@+id/buttonLearnMore"
-		style="?android:attr/borderlessButtonStyle"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/learn_more"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/textViewExplanation" />
+		<TextView
+			android:id="@+id/textViewExplanation"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:text="@string/disappearing_messages_explanation_short"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/imageViewBomb" />
 
-	<TextView
-		android:id="@+id/headlineSetting"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:text="@string/disappearing_messages_title"
-		android:textStyle="bold"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/buttonLearnMore" />
+		<Button
+			android:id="@+id/buttonLearnMore"
+			style="?android:attr/borderlessButtonStyle"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/learn_more"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/textViewExplanation" />
 
-	<TextView
-		android:id="@+id/textSetting"
-		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" />
+		<View
+			android:id="@+id/divider"
+			style="@style/Divider.Horizontal"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginVertical="16dp"
+			android:background="?android:attr/listDivider"
+			app:layout_constraintTop_toBottomOf="@+id/buttonLearnMore"
+			app:layout_constraintBottom_toTopOf="@+id/barrier1" />
 
-	<Switch
-		android:id="@+id/switchDisappearingMessages"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		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/barrier1"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:barrierDirection="top" />
 
-	<androidx.constraintlayout.widget.Barrier
-		android:id="@+id/barrier"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		app:barrierDirection="top" />
+		<TextView
+			android:id="@+id/headlineSetting"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:text="@string/disappearing_messages_title"
+			android:textStyle="bold"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/barrier1" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+		<TextView
+			android:id="@+id/textSetting"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:text="@string/disappearing_messages_summary"
+			app:layout_constraintBottom_toTopOf="@id/barrier2"
+			app:layout_constraintEnd_toStartOf="@id/switchDisappearingMessages"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/headlineSetting" />
+
+		<Switch
+			android:id="@+id/switchDisappearingMessages"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintBottom_toTopOf="@id/barrier2"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@+id/textSetting"
+			app:layout_constraintTop_toBottomOf="@+id/barrier1" />
+
+		<androidx.constraintlayout.widget.Barrier
+			android:id="@+id/barrier2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:barrierDirection="top" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file