From 923bf92b788e3094d4cec208a4e64f556c2c9ec9 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 10:40:27 +0530
Subject: [PATCH 01/13] fix: update unresolved reference to launcher icon

---
 app/src/main/res/layout/item_conversation.xml  | 2 +-
 app/src/main/res/layout/item_search_result.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 93f283258..2b02cd218 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -26,7 +26,7 @@
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/normal_margin"
             android:layout_marginEnd="@dimen/normal_margin"
-            tools:src="@mipmap/ic_sms_messenger" />
+            tools:src="@mipmap/ic_launcher" />
 
         <RelativeLayout
             android:id="@+id/pin_indicator_l"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index dcf6378b5..cd7940e72 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -14,7 +14,7 @@
         android:layout_width="@dimen/normal_icon_size"
         android:layout_height="@dimen/normal_icon_size"
         android:layout_marginEnd="@dimen/normal_margin"
-        tools:src="@mipmap/ic_sms_messenger" />
+        tools:src="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/search_result_title"

From a6bfebe92417d6438cd0c2a14c0254f870452e29 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 10:53:31 +0530
Subject: [PATCH 02/13] fix: use standard 40dp avatar size for list items

---
 app/src/main/res/layout/item_conversation.xml  | 8 ++++----
 app/src/main/res/layout/item_search_result.xml | 4 ++--
 app/src/main/res/layout/item_vcard_contact.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 2b02cd218..24c9f1566 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -19,8 +19,8 @@
 
         <ImageView
             android:id="@+id/conversation_image"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
+            android:layout_width="@dimen/list_avatar_size"
+            android:layout_height="@dimen/list_avatar_size"
             android:layout_alignTop="@+id/conversation_address"
             android:layout_alignBottom="@+id/conversation_date"
             android:layout_centerVertical="true"
@@ -30,8 +30,8 @@
 
         <RelativeLayout
             android:id="@+id/pin_indicator_l"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
+            android:layout_width="@dimen/list_avatar_size"
+            android:layout_height="@dimen/list_avatar_size"
             android:layout_alignTop="@+id/conversation_address"
             android:layout_alignBottom="@+id/conversation_date"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index cd7940e72..d615095bf 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/search_result_image"
-        android:layout_width="@dimen/normal_icon_size"
-        android:layout_height="@dimen/normal_icon_size"
+        android:layout_width="@dimen/list_avatar_size"
+        android:layout_height="@dimen/list_avatar_size"
         android:layout_marginEnd="@dimen/normal_margin"
         tools:src="@mipmap/ic_launcher" />
 
diff --git a/app/src/main/res/layout/item_vcard_contact.xml b/app/src/main/res/layout/item_vcard_contact.xml
index 7ff17f6ea..d9630146b 100644
--- a/app/src/main/res/layout/item_vcard_contact.xml
+++ b/app/src/main/res/layout/item_vcard_contact.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/item_contact_image"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
+            android:layout_width="@dimen/list_avatar_size"
+            android:layout_height="@dimen/list_avatar_size"
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/small_margin"
             android:padding="@dimen/tiny_margin"

From 4ad37309ca429bd5890167b82ec6909d1d382586 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 11:08:22 +0530
Subject: [PATCH 03/13] fix: use standard text size for conversation list items

Refs: https://github.com/FossifyOrg/General-Discussion/issues/118
---
 app/src/main/res/layout/item_conversation.xml  | 2 +-
 app/src/main/res/layout/item_search_result.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 24c9f1566..57783df42 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -58,7 +58,7 @@
             android:paddingEnd="@dimen/activity_margin"
             android:textAlignment="viewStart"
             android:textDirection="locale"
-            android:textSize="@dimen/big_text_size"
+            android:textSize="@dimen/bigger_text_size"
             tools:text="John" />
 
         <TextView
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index d615095bf..7147727d5 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -25,7 +25,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingEnd="@dimen/activity_margin"
-        android:textSize="@dimen/big_text_size"
+        android:textSize="@dimen/bigger_text_size"
         tools:text="John" />
 
     <TextView
@@ -38,7 +38,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingEnd="@dimen/activity_margin"
-        android:textSize="@dimen/big_text_size"
+        android:textSize="@dimen/normal_text_size"
         tools:text="Hey buddy!" />
 
     <TextView

From 03cea10c5c149795dccfadb832e425d2d9a2518e Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 11:19:18 +0530
Subject: [PATCH 04/13] feat: move conversation datetime to the top-right

---
 app/src/main/res/layout/item_conversation.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 57783df42..125c71bd3 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -21,8 +21,6 @@
             android:id="@+id/conversation_image"
             android:layout_width="@dimen/list_avatar_size"
             android:layout_height="@dimen/list_avatar_size"
-            android:layout_alignTop="@+id/conversation_address"
-            android:layout_alignBottom="@+id/conversation_date"
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/normal_margin"
             android:layout_marginEnd="@dimen/normal_margin"
@@ -95,14 +93,14 @@
 
         <TextView
             android:id="@+id/conversation_date"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/conversation_body_short"
-            android:layout_marginTop="@dimen/tiny_margin"
-            android:layout_toEndOf="@+id/conversation_image"
+            android:layout_alignTop="@+id/conversation_address"
+            android:layout_alignBottom="@+id/conversation_address"
+            android:layout_alignParentEnd="true"
             android:alpha="0.4"
-            android:textAlignment="viewStart"
             android:textDirection="locale"
+            android:textAlignment="viewStart"
             android:textSize="@dimen/smaller_text_size"
             tools:text="13:30" />
 

From 215d6ce08428a292c3eb643fd2e0697fe388ce70 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 11:23:38 +0530
Subject: [PATCH 05/13] feat: move the conversation pin indicator to the
 bottom-right

---
 app/src/main/res/layout/item_conversation.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 125c71bd3..50bce08e0 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -36,12 +36,6 @@
             android:layout_marginStart="@dimen/normal_margin"
             android:layout_marginEnd="@dimen/normal_margin">
 
-            <ImageView
-                android:id="@+id/pin_indicator"
-                android:layout_width="@dimen/pin_icon_size"
-                android:layout_height="@dimen/pin_icon_size"
-                android:layout_alignParentEnd="true"
-                android:src="@drawable/ic_pin_filled_vector" />
 
         </RelativeLayout>
 
@@ -82,6 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/conversation_address"
             android:layout_toEndOf="@+id/draft_indicator"
+            android:layout_toStartOf="@id/pin_indicator"
             android:ellipsize="end"
             android:maxLines="1"
             android:paddingStart="0dp"
@@ -104,5 +99,14 @@
             android:textSize="@dimen/smaller_text_size"
             tools:text="13:30" />
 
+        <ImageView
+            android:id="@+id/pin_indicator"
+            android:layout_width="@dimen/pin_icon_size"
+            android:layout_height="@dimen/pin_icon_size"
+            android:layout_alignTop="@+id/conversation_body_short"
+            android:layout_alignBottom="@+id/conversation_body_short"
+            android:layout_alignParentEnd="true"
+            android:src="@drawable/ic_pin_filled_vector" />
+
     </RelativeLayout>
 </FrameLayout>

From c0f94f1343870638e108461b3e709b6934673f0a Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 11:44:21 +0530
Subject: [PATCH 06/13] refactor: convert conversation item layouts to
 ConstraintLayout

---
 app/src/main/res/layout/item_conversation.xml | 183 ++++++++----------
 .../main/res/layout/item_search_result.xml    |  48 +++--
 2 files changed, 112 insertions(+), 119 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 50bce08e0..e792d7920 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -1,112 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/conversation_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/tiny_margin"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:paddingStart="@dimen/small_margin"
+    android:paddingTop="@dimen/medium_margin"
+    android:paddingEnd="@dimen/normal_margin"
+    android:paddingBottom="@dimen/medium_margin">
 
-    <RelativeLayout
-        android:id="@+id/conversation_holder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/small_margin"
-        android:paddingTop="@dimen/medium_margin"
-        android:paddingEnd="@dimen/normal_margin"
-        android:paddingBottom="@dimen/medium_margin">
-
-        <ImageView
-            android:id="@+id/conversation_image"
-            android:layout_width="@dimen/list_avatar_size"
-            android:layout_height="@dimen/list_avatar_size"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/normal_margin"
-            android:layout_marginEnd="@dimen/normal_margin"
-            tools:src="@mipmap/ic_launcher" />
-
-        <RelativeLayout
-            android:id="@+id/pin_indicator_l"
-            android:layout_width="@dimen/list_avatar_size"
-            android:layout_height="@dimen/list_avatar_size"
-            android:layout_alignTop="@+id/conversation_address"
-            android:layout_alignBottom="@+id/conversation_date"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/normal_margin"
-            android:layout_marginEnd="@dimen/normal_margin">
-
-
-        </RelativeLayout>
+    <ImageView
+        android:id="@+id/conversation_image"
+        android:layout_width="@dimen/list_avatar_size"
+        android:layout_height="@dimen/list_avatar_size"
+        android:layout_marginStart="@dimen/normal_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@mipmap/ic_launcher" />
 
-        <TextView
-            android:id="@+id/conversation_address"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@+id/conversation_image"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingStart="0dp"
-            android:paddingEnd="@dimen/activity_margin"
-            android:textAlignment="viewStart"
-            android:textDirection="locale"
-            android:textSize="@dimen/bigger_text_size"
-            tools:text="John" />
+    <TextView
+        android:id="@+id/conversation_address"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/normal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/activity_margin"
+        android:textAlignment="viewStart"
+        android:textDirection="locale"
+        android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintEnd_toStartOf="@id/conversation_date"
+        app:layout_constraintStart_toEndOf="@id/conversation_image"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="John" />
 
-        <TextView
-            android:id="@+id/draft_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/conversation_address"
-            android:layout_toEndOf="@+id/conversation_image"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingStart="0dp"
-            android:paddingEnd="@dimen/small_margin"
-            android:text="@string/draft"
-            android:textAlignment="viewStart"
-            android:textColor="@color/color_primary"
-            android:textDirection="locale"
-            android:textSize="@dimen/normal_text_size"
-            android:textStyle="italic" />
+    <TextView
+        android:id="@+id/draft_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/small_margin"
+        android:text="@string/draft"
+        android:textAlignment="viewStart"
+        android:textColor="@color/color_primary"
+        android:textDirection="locale"
+        android:textSize="@dimen/normal_text_size"
+        android:textStyle="italic"
+        app:layout_constraintStart_toEndOf="@id/conversation_image"
+        app:layout_constraintStart_toStartOf="@id/conversation_address"
+        app:layout_constraintTop_toBottomOf="@id/conversation_address" />
 
-        <TextView
-            android:id="@+id/conversation_body_short"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/conversation_address"
-            android:layout_toEndOf="@+id/draft_indicator"
-            android:layout_toStartOf="@id/pin_indicator"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingStart="0dp"
-            android:paddingEnd="@dimen/activity_margin"
-            android:textAlignment="viewStart"
-            android:textDirection="locale"
-            android:textSize="@dimen/normal_text_size"
-            tools:text="Hey buddy!" />
+    <TextView
+        android:id="@+id/conversation_body_short"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/activity_margin"
+        android:textAlignment="viewStart"
+        android:textDirection="locale"
+        android:textSize="@dimen/normal_text_size"
+        app:layout_constraintEnd_toStartOf="@id/pin_indicator"
+        app:layout_constraintStart_toEndOf="@id/draft_indicator"
+        app:layout_constraintTop_toBottomOf="@id/conversation_address"
+        tools:text="Hey buddy!" />
 
-        <TextView
-            android:id="@+id/conversation_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@+id/conversation_address"
-            android:layout_alignBottom="@+id/conversation_address"
-            android:layout_alignParentEnd="true"
-            android:alpha="0.4"
-            android:textDirection="locale"
-            android:textAlignment="viewStart"
-            android:textSize="@dimen/smaller_text_size"
-            tools:text="13:30" />
+    <TextView
+        android:id="@+id/conversation_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0.4"
+        android:textAlignment="viewStart"
+        android:textDirection="locale"
+        android:textSize="@dimen/smaller_text_size"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_address"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/conversation_address"
+        tools:text="13:30" />
 
-        <ImageView
-            android:id="@+id/pin_indicator"
-            android:layout_width="@dimen/pin_icon_size"
-            android:layout_height="@dimen/pin_icon_size"
-            android:layout_alignTop="@+id/conversation_body_short"
-            android:layout_alignBottom="@+id/conversation_body_short"
-            android:layout_alignParentEnd="true"
-            android:src="@drawable/ic_pin_filled_vector" />
+    <ImageView
+        android:id="@+id/pin_indicator"
+        android:layout_width="@dimen/pin_icon_size"
+        android:layout_height="@dimen/pin_icon_size"
+        android:src="@drawable/ic_pin_filled_vector"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/conversation_body_short" />
 
-    </RelativeLayout>
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 7147727d5..5eb57b8f0 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_result_holder"
     android:layout_width="match_parent"
@@ -14,44 +15,49 @@
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
         android:layout_marginEnd="@dimen/normal_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:src="@mipmap/ic_launcher" />
 
+    <TextView
+        android:id="@+id/search_result_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0.7"
+        android:textSize="@dimen/smaller_text_size"
+        app:layout_constraintBottom_toBottomOf="@id/search_result_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/search_result_title"
+        tools:text="08/02/2021" />
+
     <TextView
         android:id="@+id/search_result_title"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/search_result_date"
-        android:layout_toEndOf="@+id/search_result_image"
+        android:layout_marginStart="@dimen/normal_margin"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingEnd="@dimen/activity_margin"
         android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintEnd_toStartOf="@id/search_result_date"
+        app:layout_constraintStart_toEndOf="@id/search_result_image"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="John" />
 
     <TextView
         android:id="@+id/search_result_snippet"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/search_result_title"
-        android:layout_toEndOf="@+id/search_result_image"
+        android:layout_marginStart="@dimen/normal_margin"
         android:alpha="0.7"
         android:ellipsize="end"
         android:maxLines="1"
         android:paddingEnd="@dimen/activity_margin"
         android:textSize="@dimen/normal_text_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/search_result_image"
+        app:layout_constraintTop_toBottomOf="@id/search_result_title"
         tools:text="Hey buddy!" />
 
-    <TextView
-        android:id="@+id/search_result_date"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignTop="@+id/search_result_title"
-        android:layout_alignBottom="@+id/search_result_title"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/tiny_margin"
-        android:alpha="0.7"
-        android:gravity="center_vertical"
-        android:textSize="@dimen/smaller_text_size"
-        tools:text="08/02/2021" />
-
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From e57144fe3ea3f83b403c96887fb609587164b291 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 12:06:14 +0530
Subject: [PATCH 07/13] fix: use standard padding for elements in conversation
 list item

---
 app/src/main/res/layout/item_conversation.xml  | 18 +++++++-----------
 app/src/main/res/layout/item_search_result.xml | 14 ++++++--------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index e792d7920..b2cc20f75 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -8,16 +8,15 @@
     android:layout_marginBottom="@dimen/tiny_margin"
     android:clickable="true"
     android:focusable="true"
-    android:paddingStart="@dimen/small_margin"
+    android:paddingStart="@dimen/activity_margin"
     android:paddingTop="@dimen/medium_margin"
-    android:paddingEnd="@dimen/normal_margin"
+    android:paddingEnd="@dimen/activity_margin"
     android:paddingBottom="@dimen/medium_margin">
 
     <ImageView
         android:id="@+id/conversation_image"
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
-        android:layout_marginStart="@dimen/normal_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -27,11 +26,9 @@
         android:id="@+id/conversation_address"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/normal_margin"
+        android:layout_marginHorizontal="@dimen/activity_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingStart="0dp"
-        android:paddingEnd="@dimen/activity_margin"
         android:textAlignment="viewStart"
         android:textDirection="locale"
         android:textSize="@dimen/bigger_text_size"
@@ -44,16 +41,16 @@
         android:id="@+id/draft_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/small_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingStart="0dp"
-        android:paddingEnd="@dimen/small_margin"
         android:text="@string/draft"
         android:textAlignment="viewStart"
         android:textColor="@color/color_primary"
         android:textDirection="locale"
         android:textSize="@dimen/normal_text_size"
         android:textStyle="italic"
+        app:layout_constraintEnd_toStartOf="@id/conversation_body_short"
         app:layout_constraintStart_toEndOf="@id/conversation_image"
         app:layout_constraintStart_toStartOf="@id/conversation_address"
         app:layout_constraintTop_toBottomOf="@id/conversation_address" />
@@ -62,10 +59,9 @@
         android:id="@+id/conversation_body_short"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/activity_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingStart="0dp"
-        android:paddingEnd="@dimen/activity_margin"
         android:textAlignment="viewStart"
         android:textDirection="locale"
         android:textSize="@dimen/normal_text_size"
@@ -78,7 +74,7 @@
         android:id="@+id/conversation_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:alpha="0.4"
+        android:alpha="0.7"
         android:textAlignment="viewStart"
         android:textDirection="locale"
         android:textSize="@dimen/smaller_text_size"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 5eb57b8f0..43a0215b3 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -5,16 +5,16 @@
     android:id="@+id/search_result_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/medium_margin"
-    android:layout_marginBottom="@dimen/medium_margin"
     android:background="?attr/selectableItemBackground"
-    android:padding="@dimen/activity_margin">
+    android:paddingStart="@dimen/activity_margin"
+    android:paddingTop="@dimen/medium_margin"
+    android:paddingEnd="@dimen/activity_margin"
+    android:paddingBottom="@dimen/medium_margin">
 
     <ImageView
         android:id="@+id/search_result_image"
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
-        android:layout_marginEnd="@dimen/normal_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,10 +35,9 @@
         android:id="@+id/search_result_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/normal_margin"
+        android:layout_marginHorizontal="@dimen/activity_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingEnd="@dimen/activity_margin"
         android:textSize="@dimen/bigger_text_size"
         app:layout_constraintEnd_toStartOf="@id/search_result_date"
         app:layout_constraintStart_toEndOf="@id/search_result_image"
@@ -49,11 +48,10 @@
         android:id="@+id/search_result_snippet"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/activity_margin"
         android:alpha="0.7"
         android:ellipsize="end"
         android:maxLines="1"
-        android:paddingEnd="@dimen/activity_margin"
         android:textSize="@dimen/normal_text_size"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/search_result_image"

From ce004b3705039343511f589f47e356ea731226b2 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 12:17:20 +0530
Subject: [PATCH 08/13] fix: use proper constraints for list items

---
 app/src/main/res/layout/item_conversation.xml |  9 ++++--
 .../main/res/layout/item_search_result.xml    | 28 ++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index b2cc20f75..599d388cb 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -17,9 +17,9 @@
         android:id="@+id/conversation_image"
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/conversation_address"
         tools:src="@mipmap/ic_launcher" />
 
     <TextView
@@ -32,6 +32,7 @@
         android:textAlignment="viewStart"
         android:textDirection="locale"
         android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintBottom_toTopOf="@id/conversation_body_short"
         app:layout_constraintEnd_toStartOf="@id/conversation_date"
         app:layout_constraintStart_toEndOf="@id/conversation_image"
         app:layout_constraintTop_toTopOf="parent"
@@ -50,10 +51,11 @@
         android:textDirection="locale"
         android:textSize="@dimen/normal_text_size"
         android:textStyle="italic"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintEnd_toStartOf="@id/conversation_body_short"
         app:layout_constraintStart_toEndOf="@id/conversation_image"
         app:layout_constraintStart_toStartOf="@id/conversation_address"
-        app:layout_constraintTop_toBottomOf="@id/conversation_address" />
+        app:layout_constraintTop_toTopOf="@id/conversation_body_short" />
 
     <TextView
         android:id="@+id/conversation_body_short"
@@ -65,6 +67,7 @@
         android:textAlignment="viewStart"
         android:textDirection="locale"
         android:textSize="@dimen/normal_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/pin_indicator"
         app:layout_constraintStart_toEndOf="@id/draft_indicator"
         app:layout_constraintTop_toBottomOf="@id/conversation_address"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 43a0215b3..76867cf1a 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -15,21 +15,10 @@
         android:id="@+id/search_result_image"
         android:layout_width="@dimen/list_avatar_size"
         android:layout_height="@dimen/list_avatar_size"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/search_result_snippet"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@mipmap/ic_launcher" />
-
-    <TextView
-        android:id="@+id/search_result_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:alpha="0.7"
-        android:textSize="@dimen/smaller_text_size"
-        app:layout_constraintBottom_toBottomOf="@id/search_result_title"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/search_result_title"
-        tools:text="08/02/2021" />
+        tools:src="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/search_result_title"
@@ -39,6 +28,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="@dimen/bigger_text_size"
+        app:layout_constraintBottom_toTopOf="@id/search_result_snippet"
         app:layout_constraintEnd_toStartOf="@id/search_result_date"
         app:layout_constraintStart_toEndOf="@id/search_result_image"
         app:layout_constraintTop_toTopOf="parent"
@@ -53,9 +43,21 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="@dimen/normal_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/search_result_image"
         app:layout_constraintTop_toBottomOf="@id/search_result_title"
         tools:text="Hey buddy!" />
 
+    <TextView
+        android:id="@+id/search_result_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:alpha="0.7"
+        android:textSize="@dimen/smaller_text_size"
+        app:layout_constraintBottom_toBottomOf="@id/search_result_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/search_result_title"
+        tools:text="08/02/2021" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From 075946bc040bbcb44ae4ca172acb5d2a549710f1 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 13:20:47 +0530
Subject: [PATCH 09/13] fix: use standard list item height for conversations

---
 app/src/main/res/layout/item_conversation.xml  | 5 +++--
 app/src/main/res/layout/item_message.xml       | 4 ++--
 app/src/main/res/layout/item_search_result.xml | 6 +++---
 app/src/main/res/layout/item_vcard_contact.xml | 4 ++--
 gradle/libs.versions.toml                      | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 599d388cb..a2b3f79e6 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -5,6 +5,7 @@
     android:id="@+id/conversation_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="@dimen/two_line_list_item_min_height"
     android:layout_marginBottom="@dimen/tiny_margin"
     android:clickable="true"
     android:focusable="true"
@@ -15,8 +16,8 @@
 
     <ImageView
         android:id="@+id/conversation_image"
-        android:layout_width="@dimen/list_avatar_size"
-        android:layout_height="@dimen/list_avatar_size"
+        android:layout_width="@dimen/list_icon_size_medium"
+        android:layout_height="@dimen/list_icon_size_medium"
         app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/conversation_address"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 2951adaf8..6dcbac833 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -20,8 +20,8 @@
 
         <ImageView
             android:id="@+id/thread_message_sender_photo"
-            android:layout_width="@dimen/list_avatar_size"
-            android:layout_height="@dimen/list_avatar_size"
+            android:layout_width="@dimen/list_icon_size_medium"
+            android:layout_height="@dimen/list_icon_size_medium"
             android:layout_alignBottom="@+id/thread_message_body"
             android:layout_alignParentStart="true"
             android:layout_marginEnd="@dimen/medium_margin"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 76867cf1a..f3db0adfe 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_result_holder"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/two_line_list_item_min_height"
     android:background="?attr/selectableItemBackground"
     android:paddingStart="@dimen/activity_margin"
     android:paddingTop="@dimen/medium_margin"
@@ -13,8 +13,8 @@
 
     <ImageView
         android:id="@+id/search_result_image"
-        android:layout_width="@dimen/list_avatar_size"
-        android:layout_height="@dimen/list_avatar_size"
+        android:layout_width="@dimen/list_icon_size_medium"
+        android:layout_height="@dimen/list_icon_size_medium"
         app:layout_constraintBottom_toBottomOf="@id/search_result_snippet"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/search_result_title"
diff --git a/app/src/main/res/layout/item_vcard_contact.xml b/app/src/main/res/layout/item_vcard_contact.xml
index d9630146b..46673b944 100644
--- a/app/src/main/res/layout/item_vcard_contact.xml
+++ b/app/src/main/res/layout/item_vcard_contact.xml
@@ -21,8 +21,8 @@
 
         <ImageView
             android:id="@+id/item_contact_image"
-            android:layout_width="@dimen/list_avatar_size"
-            android:layout_height="@dimen/list_avatar_size"
+            android:layout_width="@dimen/list_icon_size_medium"
+            android:layout_height="@dimen/list_icon_size_medium"
             android:layout_centerVertical="true"
             android:layout_marginStart="@dimen/small_margin"
             android:padding="@dimen/tiny_margin"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 66f90336d..f4ec5634c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ eventbus = "3.3.1"
 #Room
 room = "2.8.2"
 #Fossify
-commons = "5.3.0"
+commons = "5.3.1"
 mmslib = "1.0.0"
 indicator-fast-scroll = "4524cd0b61"
 #Gradle

From bd5c61f6e1126fb98734d4d412f99ae87e0123ce Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 13:29:53 +0530
Subject: [PATCH 10/13] feat: lower pin indicator alpha to 0.7

---
 app/src/main/res/layout/item_conversation.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index a2b3f79e6..2eb8ba329 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -91,6 +91,7 @@
         android:id="@+id/pin_indicator"
         android:layout_width="@dimen/pin_icon_size"
         android:layout_height="@dimen/pin_icon_size"
+        android:alpha="0.7"
         android:src="@drawable/ic_pin_filled_vector"
         app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintEnd_toEndOf="parent"

From bc49ab4a94ca019dfb50b85f6ddb6f29352dbbb7 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 13:32:09 +0530
Subject: [PATCH 11/13] fix: use standard text sizes from commons

---
 app/src/main/res/layout/item_conversation.xml  | 8 ++++----
 app/src/main/res/layout/item_search_result.xml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index 2eb8ba329..cba91e8ee 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -5,10 +5,10 @@
     android:id="@+id/conversation_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/two_line_list_item_min_height"
     android:layout_marginBottom="@dimen/tiny_margin"
     android:clickable="true"
     android:focusable="true"
+    android:minHeight="@dimen/two_line_list_item_min_height"
     android:paddingStart="@dimen/activity_margin"
     android:paddingTop="@dimen/medium_margin"
     android:paddingEnd="@dimen/activity_margin"
@@ -32,7 +32,7 @@
         android:maxLines="1"
         android:textAlignment="viewStart"
         android:textDirection="locale"
-        android:textSize="@dimen/bigger_text_size"
+        android:textSize="@dimen/list_primary_text_size"
         app:layout_constraintBottom_toTopOf="@id/conversation_body_short"
         app:layout_constraintEnd_toStartOf="@id/conversation_date"
         app:layout_constraintStart_toEndOf="@id/conversation_image"
@@ -50,7 +50,7 @@
         android:textAlignment="viewStart"
         android:textColor="@color/color_primary"
         android:textDirection="locale"
-        android:textSize="@dimen/normal_text_size"
+        android:textSize="@dimen/list_secondary_text_size"
         android:textStyle="italic"
         app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintEnd_toStartOf="@id/conversation_body_short"
@@ -81,7 +81,7 @@
         android:alpha="0.7"
         android:textAlignment="viewStart"
         android:textDirection="locale"
-        android:textSize="@dimen/smaller_text_size"
+        android:textSize="@dimen/list_tertiary_text_size"
         app:layout_constraintBottom_toBottomOf="@id/conversation_address"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/conversation_address"
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index f3db0adfe..22c37a4a9 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -27,7 +27,7 @@
         android:layout_marginHorizontal="@dimen/activity_margin"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="@dimen/bigger_text_size"
+        android:textSize="@dimen/list_primary_text_size"
         app:layout_constraintBottom_toTopOf="@id/search_result_snippet"
         app:layout_constraintEnd_toStartOf="@id/search_result_date"
         app:layout_constraintStart_toEndOf="@id/search_result_image"
@@ -42,7 +42,7 @@
         android:alpha="0.7"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="@dimen/normal_text_size"
+        android:textSize="@dimen/list_secondary_text_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/search_result_image"
@@ -54,7 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:alpha="0.7"
-        android:textSize="@dimen/smaller_text_size"
+        android:textSize="@dimen/list_tertiary_text_size"
         app:layout_constraintBottom_toBottomOf="@id/search_result_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/search_result_title"

From 0113ec291288289874e2c482d6861617abdda307 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 14:04:03 +0530
Subject: [PATCH 12/13] docs: update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c4e9280f..2518cb0e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Optimized loading messages in conversations
+- Updated conversation item design to be more compact ([#376])
 
 ### Fixed
 - Fixed position reset when opening attachments in conversations ([#82])
 - Fixed automatic scroll to searched message in conversations ([#350])
+- Fixed non-standard text and avatar sizes in list items
 
 ## [1.4.0] - 2025-10-12
 ### Added
@@ -171,6 +173,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#349]: https://github.com/FossifyOrg/Messages/issues/349
 [#350]: https://github.com/FossifyOrg/Messages/issues/350
 [#359]: https://github.com/FossifyOrg/Messages/issues/359
+[#376]: https://github.com/FossifyOrg/Messages/issues/376
 [#456]: https://github.com/FossifyOrg/Messages/issues/456
 [#461]: https://github.com/FossifyOrg/Messages/issues/461
 

From aba85bb0a65fde972d6a68e104678f7c5cfc6b05 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Wed, 15 Oct 2025 14:10:39 +0530
Subject: [PATCH 13/13] fix: minor layout fixes

---
 app/src/main/res/layout/item_conversation.xml  | 1 -
 app/src/main/res/layout/item_search_result.xml | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index cba91e8ee..8bdd52b1e 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -54,7 +54,6 @@
         android:textStyle="italic"
         app:layout_constraintBottom_toBottomOf="@id/conversation_body_short"
         app:layout_constraintEnd_toStartOf="@id/conversation_body_short"
-        app:layout_constraintStart_toEndOf="@id/conversation_image"
         app:layout_constraintStart_toStartOf="@id/conversation_address"
         app:layout_constraintTop_toTopOf="@id/conversation_body_short" />
 
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 22c37a4a9..675e4f9fe 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -4,8 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/search_result_holder"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/two_line_list_item_min_height"
+    android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:minHeight="@dimen/two_line_list_item_min_height"
     android:paddingStart="@dimen/activity_margin"
     android:paddingTop="@dimen/medium_margin"
     android:paddingEnd="@dimen/activity_margin"