diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml
index 5dd6eea9..312d9055 100644
--- a/presentation/src/main/res/layout/message_list_item_in.xml
+++ b/presentation/src/main/res/layout/message_list_item_in.xml
@@ -18,120 +18,125 @@
~ along with QKSMS. If not, see .
-->
-
-
-
-
-
-
-
-
-
-
-
+ android:background="?attr/selectableItemBackground">
+ android:layout_marginEnd="36dp"
+ android:orientation="vertical">
-
+
+
+
+
+
+
+
+
+
+ android:orientation="horizontal"
+ app:layout_constraintBottom_toBottomOf="parent">
-
+
-
+ android:layout_marginStart="12dp"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml
index eebf3117..020e1cb6 100644
--- a/presentation/src/main/res/layout/message_list_item_out.xml
+++ b/presentation/src/main/res/layout/message_list_item_out.xml
@@ -17,174 +17,180 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see .
-->
-
+ android:background="?attr/selectableItemBackground">
-
-
+ android:layout_marginStart="36dp"
+ android:layout_marginEnd="12dp"
+ android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:contentDescription="@string/compose_message_item">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ android:baselineAlignBottom="true"
+ android:contentDescription="@string/compose_message_send_now"
+ android:padding="6dp"
+ android:src="@drawable/ic_send_black_24dp"
+ android:visibility="gone"
+ tools:tint="@color/tools_theme"
+ tools:visibility="visible" />
-
+
-
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file