diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCardDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCardDialogFragment.kt
index 9e300fead7..6fdb8492b3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCardDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCardDialogFragment.kt
@@ -14,7 +14,9 @@ import org.thoughtcrime.securesms.R
 /**
  * Displays a small progress spinner in a card view, as a non-cancellable dialog fragment.
  */
-class ProgressCardDialogFragment @Discouraged("Use create() instead.") constructor() : DialogFragment(R.layout.progress_card_dialog) {
+class ProgressCardDialogFragment
+@Discouraged("Use create() instead.")
+constructor() : DialogFragment(R.layout.progress_card_dialog) {
 
   companion object {
     @SuppressLint("DiscouragedApi")
diff --git a/app/src/main/res/layout/backup_enable_dialog.xml b/app/src/main/res/layout/backup_enable_dialog.xml
index e25b0541d0..c3e3b8020f 100644
--- a/app/src/main/res/layout/backup_enable_dialog.xml
+++ b/app/src/main/res/layout/backup_enable_dialog.xml
@@ -1,95 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:paddingTop="16dp"
-              android:paddingStart="23dp"
-              android:paddingEnd="23dp">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:viewBindingIgnore="true">
 
-    <TextView android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:textSize="12sp"
-              android:text="@string/backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="23dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="23dp"
+        tools:viewBindingIgnore="true">
 
-    <TableLayout android:id="@+id/number_table"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_marginTop="16dp"
-                 android:layout_gravity="center_horizontal"
-                 android:clickable="true"
-                 android:focusable="true">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/backup_enable_dialog__backups_will_be_saved_to_external_storage_and_encrypted_with_the_passphrase_below_you_must_have_this_passphrase_in_order_to_restore_a_backup"
+            android:textSize="12sp" />
 
-        <TableRow android:gravity="center_horizontal"
-                  android:layoutDirection="ltr"
-                  android:clickable="false"
-                  android:focusable="false">
+        <TableLayout
+            android:id="@+id/number_table"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp"
+            android:clickable="true"
+            android:focusable="true">
 
-            <TextView android:id="@+id/code_first"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/BackupPassphrase"
-                      tools:text="22934"/>
+            <TableRow
+                android:clickable="false"
+                android:focusable="false"
+                android:gravity="center_horizontal"
+                android:layoutDirection="ltr">
 
-            <TextView android:id="@+id/code_second"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="8dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="56944" />
+                <TextView
+                    android:id="@+id/code_first"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="22934" />
 
-            <TextView android:id="@+id/code_third"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="8dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="42738" />
-        </TableRow>
+                <TextView
+                    android:id="@+id/code_second"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="56944" />
 
-        <TableRow android:gravity="center_horizontal"
-                  android:layoutDirection="ltr"
-                  android:layout_marginTop="4dp">
+                <TextView
+                    android:id="@+id/code_third"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="42738" />
+            </TableRow>
 
-            <TextView android:id="@+id/code_fourth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      style="@style/BackupPassphrase"
-                      tools:text="34431"/>
+            <TableRow
+                android:layout_marginTop="4dp"
+                android:gravity="center_horizontal"
+                android:layoutDirection="ltr">
 
-            <TextView android:id="@+id/code_fifth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="8dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="24922" />
+                <TextView
+                    android:id="@+id/code_fourth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="34431" />
 
-            <TextView android:id="@+id/code_sixth"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginStart="8dp"
-                      style="@style/BackupPassphrase"
-                      tools:text="58594" />
-        </TableRow>
-    </TableLayout>
+                <TextView
+                    android:id="@+id/code_fifth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="24922" />
 
-    <LinearLayout android:layout_marginTop="20dp"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-            android:gravity="center">
+                <TextView
+                    android:id="@+id/code_sixth"
+                    style="@style/BackupPassphrase"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    tools:text="58594" />
+            </TableRow>
+        </TableLayout>
 
-        <CheckBox android:id="@+id/confirmation_check"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_marginEnd="10dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/confirmation_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp" />
+
+            <TextView
+                android:id="@+id/confirmation_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"
+                android:textSize="12sp" />
+        </LinearLayout>
 
-        <TextView android:id="@+id/confirmation_text"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textSize="12sp"
-                  android:text="@string/backup_enable_dialog__i_have_written_down_this_passphrase"/>
     </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file