diff --git a/app/build.gradle b/app/build.gradle
index dcbd93f7..de0272d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.25.8'
+    implementation 'com.simplemobiletools:commons:5.25.9'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.klinkerapps:android-smsmms:5.2.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 61c464c0..d32a41e3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -169,10 +169,10 @@ class ThreadActivity : SimpleActivity() {
         getAvailableContacts {
             runOnUiThread {
                 val adapter = AutoCompleteTextViewAdapter(this, it)
-                new_message_to.setAdapter(adapter)
-                new_message_to.imeOptions = EditorInfo.IME_ACTION_NEXT
-                new_message_to.setOnItemClickListener { _, _, position, _ ->
-                    val currContacts = (new_message_to.adapter as AutoCompleteTextViewAdapter).resultList
+                add_contact_or_number.setAdapter(adapter)
+                add_contact_or_number.imeOptions = EditorInfo.IME_ACTION_NEXT
+                add_contact_or_number.setOnItemClickListener { _, _, position, _ ->
+                    val currContacts = (add_contact_or_number.adapter as AutoCompleteTextViewAdapter).resultList
                     val selectedContact = currContacts[position]
                     addSelectedContact(selectedContact)
                 }
@@ -181,7 +181,7 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun setupButtons() {
-        thread_type_message.setColors(config.textColor, config.primaryColor, config.backgroundColor)
+        updateTextColors(thread_holder)
         thread_send_message.applyColorFilter(config.textColor)
         confirm_manage_contacts.applyColorFilter(config.textColor)
         thread_add_attachment.applyColorFilter(config.textColor)
@@ -248,8 +248,8 @@ class ThreadActivity : SimpleActivity() {
         } else {
             showSelectedContacts()
             thread_add_contacts.beVisible()
-            new_message_to.requestFocus()
-            showKeyboard(new_message_to)
+            add_contact_or_number.requestFocus()
+            showKeyboard(add_contact_or_number)
         }
     }
 
@@ -271,7 +271,7 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun addSelectedContact(contact: Contact) {
-        new_message_to.setText("")
+        add_contact_or_number.setText("")
         if (participants.map { it.id }.contains(contact.id)) {
             return
         }
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 9aabd74d..753364cc 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -42,7 +42,7 @@
             android:importantForAccessibility="no" />
 
         <com.simplemobiletools.commons.views.MyAutoCompleteTextView
-            android:id="@+id/new_message_to"
+            android:id="@+id/add_contact_or_number"
             android:layout_width="match_parent"
             android:layout_height="@dimen/normal_icon_size"
             android:layout_below="@+id/message_divider_one"
@@ -59,7 +59,7 @@
             android:id="@+id/message_divider_two"
             android:layout_width="match_parent"
             android:layout_height="1px"
-            android:layout_below="@+id/new_message_to"
+            android:layout_below="@+id/add_contact_or_number"
             android:background="@color/divider_grey"
             android:importantForAccessibility="no" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/item_selected_contact.xml b/app/src/main/res/layout/item_selected_contact.xml
index a67f9851..aa4b012a 100644
--- a/app/src/main/res/layout/item_selected_contact.xml
+++ b/app/src/main/res/layout/item_selected_contact.xml
@@ -14,6 +14,7 @@
         android:paddingTop="@dimen/normal_margin"
         android:paddingBottom="@dimen/normal_margin"
         android:textSize="@dimen/bigger_text_size"
+        android:textColor="@color/md_grey_white"
         tools:text="John" />
 
     <ImageView