diff --git a/app/src/main/res/layout/dialog_configure_conversation_ephemeral_messages.xml b/app/src/main/res/layout/dialog_configure_conversation_ephemeral_messages.xml
index ec531eb21..2e7390daa 100644
--- a/app/src/main/res/layout/dialog_configure_conversation_ephemeral_messages.xml
+++ b/app/src/main/res/layout/dialog_configure_conversation_ephemeral_messages.xml
@@ -62,14 +62,16 @@
 
         <LinearLayout
             android:id="@+id/possible_values"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:orientation="vertical"
             app:layout_constraintTop_toBottomOf="@id/subtitle"
             app:layout_constraintBottom_toTopOf="@id/cancel"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent">
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background">
 
             <View
                 android:layout_width="match_parent"
@@ -81,8 +83,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(0)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"
@@ -102,8 +102,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(60)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"
@@ -123,8 +121,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(3600)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"
@@ -144,8 +140,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(86400)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"
@@ -165,8 +159,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(259200)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"
@@ -186,8 +178,6 @@
                 android:onClick="@{() -> viewModel.onValueSelected(604800)}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:paddingTop="10dp"
                 android:paddingBottom="10dp"
                 android:background="@drawable/primary_cell_background"