diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5309ad5f71..85e89a63b0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -11,6 +11,7 @@
     <attr name="conversation_list_item_subject_color" format="reference|color"/>
     <attr name="conversation_list_item_delivery_icon_color" format="reference|color"/>
     <attr name="conversation_list_item_date_color" format="reference|color"/>
+    <attr name="conversation_list_item_unread_color" format="reference|color"/>
     <attr name="conversation_list_item_divider" format="reference"/>
 
     <attr name="conversation_sent_card_background" format="reference|color"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2af07fccd3..66cced2f93 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -136,6 +136,7 @@
         <item name="conversation_list_item_subject_color">@color/core_light_60</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
         <item name="conversation_list_item_date_color">@color/core_light_60</item>
+        <item name="conversation_list_item_unread_color">@color/core_black</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
 
         <item name="fab_color">@color/textsecure_primary</item>
@@ -278,6 +279,7 @@
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
         <item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>
         <item name="conversation_list_item_date_color">#ffdddddd</item>
+        <item name="conversation_list_item_unread_color">@color/core_white</item>
         <item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
 
         <item name="conversation_group_member_name">#99ffffff</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index fa32f599b9..1fe541ee8c 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -50,6 +50,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -148,12 +149,16 @@ public class ConversationListItem extends RelativeLayout
     }
 
     this.subjectView.setText(thread.getDisplayBody());
-//    this.subjectView.setTypeface(read ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
+    this.subjectView.setTypeface(unreadCount == 0 ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
+    this.subjectView.setTextColor(unreadCount == 0 ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color)
+                                                   : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color));
 
     if (thread.getDate() > 0) {
       CharSequence date = DateUtils.getBriefRelativeTimeSpanString(getContext(), locale, thread.getDate());
-      dateView.setText(unreadCount == 0 ? date : color(getResources().getColor(R.color.textsecure_primary_dark), date));
+      dateView.setText(date);
       dateView.setTypeface(unreadCount == 0 ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
+      dateView.setTextColor(unreadCount == 0 ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_date_color)
+                                             : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color));
     }
 
     if (thread.isArchived()) {