diff --git a/app/src/main/res/layout/item_message_minimized.xml b/app/src/main/res/layout/item_message_minimized.xml
index f556959..0b2e209 100644
--- a/app/src/main/res/layout/item_message_minimized.xml
+++ b/app/src/main/res/layout/item_message_minimized.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:padding="8dp"
     android:background="@drawable/border_bottom">
 
     <ImageView
@@ -11,7 +12,7 @@
         android:layout_height="24dp"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_margin="16dp"
+        android:layout_marginTop="5dp"
         android:src="@color/colorPrimaryDark"
         tools:ignore="ContentDescription" />
 
@@ -20,16 +21,13 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignTop="@+id/avatar"
-        android:layout_marginTop="-5dp"
+        android:layout_alignParentTop="true"
         android:layout_toEndOf="@+id/avatar"
         android:ellipsize="end"
         android:lines="1"
         android:paddingBottom="0dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:paddingTop="0dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:textStyle="bold"
         tools:text="Sender" />
 
@@ -44,8 +42,8 @@
         android:gravity="center_vertical"
         android:lines="1"
         android:paddingBottom="8dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:text="Text" />