diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 63a29bc5c6c3710b8c6323e7833fb00b7e1dc063..d53bc13a818db56b4dc76a0973272575578f33d7 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -53,8 +53,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:layout_marginRight="4sp"
-                    android:textAppearance="@style/TextAppearance.Conversations.Caption"
-                    android:textStyle="bold"/>
+                    android:textAppearance="@style/TextAppearance.Conversations.Caption.OnDark.Bold"/>
 
                 <ImageView
                     android:id="@+id/security_indicator"
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index cba8b63983fc867ad5c5eff92df633d1b48a46ea..60da3775f431b230b265137341eeb659df230958 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -10,8 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:inputType="textPersonName"
-        android:textColor="?attr/color_text_primary" >
+        android:inputType="textPersonName">
 
         <requestFocus />
     </EditText>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 57a91c118dbc4f9bb2922c958447098458e1448d..b74533594dbf1c7c22cdc86ddb2384198476943a 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -20,13 +20,16 @@
     <style name="TextAppearance.Conversations.Caption.OnDark" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/white70</item>
     </style>
+    <style name="TextAppearance.Conversations.Caption.OnDark.Bold" parent="TextAppearance.Conversations.Caption.OnDark">
+        <item name="android:textStyle">bold</item>
+    </style>
     <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption">
     </style>
     <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/red800</item>
     </style>
     <style name="TextAppearance.Conversations.Caption.Highlight" parent="TextAppearance.Conversations.Caption">
-        <item name="android:textColor">?android:colorAccent</item>
+        <item name="android:textColor">?colorAccent</item>
     </style>
     <style name="TextAppearance.Conversations.Caption.Disabled" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">?android:textColorTertiary</item>