diff --git a/app/src/main/res/drawable/chat_message_sending_edit_text_background.xml b/app/src/main/res/drawable/chat_message_sending_edit_text_background.xml
new file mode 100644
index 000000000..f0e3941fc
--- /dev/null
+++ b/app/src/main/res/drawable/chat_message_sending_edit_text_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/shape_edit_text_focused_background" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/shape_edit_text_disabled_background" />
+    <item
+        android:drawable="@drawable/shape_chat_message_sending_edit_text_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_chat_message_sending_edit_text_background.xml b/app/src/main/res/drawable/shape_chat_message_sending_edit_text_background.xml
new file mode 100644
index 000000000..9ce47177b
--- /dev/null
+++ b/app/src/main/res/drawable/shape_chat_message_sending_edit_text_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="63dp" />
+    <solid android:color="?attr/color_message_text_field_background"/>
+    <stroke android:width="1dp" android:color="?attr/color_grey_200" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_conversation_send_area.xml b/app/src/main/res/layout/chat_conversation_send_area.xml
index a00766bbb..5b1f703aa 100644
--- a/app/src/main/res/layout/chat_conversation_send_area.xml
+++ b/app/src/main/res/layout/chat_conversation_send_area.xml
@@ -121,7 +121,7 @@
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="16dp"
-            android:src="@drawable/edit_text_background"
+            android:src="@drawable/chat_message_sending_edit_text_background"
             android:contentDescription="@null"
             app:layout_constraintBottom_toBottomOf="@id/message_to_send"
             app:layout_constraintEnd_toEndOf="parent"
@@ -129,8 +129,8 @@
             app:layout_constraintTop_toTopOf="@id/message_to_send" />
 
         <org.linphone.ui.main.chat.view.RichEditText
-            android:id="@+id/message_to_send"
             style="@style/default_text_style"
+            android:id="@+id/message_to_send"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
@@ -144,7 +144,6 @@
             android:maxLines="3"
             android:minHeight="48dp"
             android:text="@={viewModel.textToSend}"
-            android:textColorHint="?attr/color_main2_400"
             android:textSize="14sp"
             android:enabled="@{!viewModel.isVoiceRecording}"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b9d7b0da9..80c707bb2 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -63,6 +63,7 @@
         <item name="color_chat_bubble_incoming">@color/background_color_alt_dark_mode</item>
         <item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
         <item name="color_chat_bubble_reply">@color/gray_500</item>
+        <item name="color_message_text_field_background">@color/gray_500</item>
 
         <item name="color_gradient_start">@color/background_color_alt_dark_mode</item>
         <item name="color_gradient_end">@color/background_color_alt_dark_mode</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 85153dde2..a0eed87af 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -61,6 +61,7 @@
         <attr name="color_chat_bubble_incoming" format="color"/>
         <attr name="color_chat_bubble_outgoing" format="color"/>
         <attr name="color_chat_bubble_reply" format="color"/>
+        <attr name="color_message_text_field_background" format="color"/>
 
         <attr name="color_gradient_start" format="color"/>
         <attr name="color_gradient_end" format="color"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eac328c3c..2a9d7cde6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -64,6 +64,7 @@
         <item name="color_chat_bubble_incoming">@color/gray_main2_100</item>
         <item name="color_chat_bubble_outgoing">@color/orange_main_100</item>
         <item name="color_chat_bubble_reply">@color/gray_200</item>
+        <item name="color_message_text_field_background">@color/bc_white</item>
 
         <item name="color_gradient_start">@color/gray_main2_100</item>
         <item name="color_gradient_end">@color/bc_white</item>