diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index bf0be129e5..cbac59c280 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -167,7 +167,7 @@ object ConversationMenuHelper {
             val group = DatabaseFactory.getGroupDatabase(context).getGroup(thread.address.toGroupString()).orNull()
             if (group?.isActive == false) { return }
         }
-        ExpirationDialog.show(context, thread.expireMessages, ExpirationDialog.OnClickListener { expirationTime: Int ->
+        ExpirationDialog.show(context, thread.expireMessages) { expirationTime: Int ->
             DatabaseFactory.getRecipientDatabase(context).setExpireMessages(thread, expirationTime)
             val message = ExpirationTimerUpdate(expirationTime)
             message.recipient = thread.address.serialize()
@@ -177,7 +177,7 @@ object ConversationMenuHelper {
             MessageSender.send(message, thread.address)
             val activity = context as AppCompatActivity
             activity.invalidateOptionsMenu()
-        })
+        }
     }
 
     private fun unblock(context: Context, thread: Recipient) {
diff --git a/app/src/main/res/layout/expiration_dialog.xml b/app/src/main/res/layout/expiration_dialog.xml
index efe2831a89..66fafb4136 100644
--- a/app/src/main/res/layout/expiration_dialog.xml
+++ b/app/src/main/res/layout/expiration_dialog.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center">
 
     <cn.carbswang.android.numberpickerview.library.NumberPickerView
-            android:id="@+id/expiration_number_picker"
-            android:layout_alignParentTop="true"
-            app:npv_WrapSelectorWheel="false"
-            app:npv_DividerColor="#cbc8ea"
-            app:npv_TextColorNormal="?conversation_number_picker_text_color_normal"
-            app:npv_TextColorSelected="?conversation_number_picker_text_color_selected"
-            app:npv_ItemPaddingVertical="20dp"
-            app:npv_TextColorHint="@color/grey_600"
-            app:npv_TextSizeNormal="16sp"
-            app:npv_TextSizeSelected="16sp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/expiration_details"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/expiration_number_picker"
-              android:minLines="3"
-              android:padding="20dp"
-              tools:text="Your messages will not expire."/>
+        android:id="@+id/expiration_number_picker"
+        android:layout_alignParentTop="true"
+        app:npv_WrapSelectorWheel="false"
+        app:npv_DividerColor="#cbc8ea"
+        app:npv_TextColorNormal="@color/text"
+        app:npv_TextColorSelected="@color/text"
+        app:npv_ItemPaddingVertical="20dp"
+        app:npv_TextColorHint="@color/grey_600"
+        app:npv_TextSizeNormal="16sp"
+        app:npv_TextSizeSelected="16sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 
+    <TextView
+        android:id="@+id/expiration_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/expiration_number_picker"
+        android:minLines="3"
+        android:padding="20dp"
+        tools:text="Your messages will not expire."/>
 
 </RelativeLayout>
\ No newline at end of file