diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
index 5b93c5855..c62bffc89 100644
--- a/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
+++ b/FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/MessageEntity.kt
@@ -99,6 +99,7 @@ data class MessageEntity(
   @ColumnInfo(name = "label_ids", defaultValue = "NULL") val labelIds: String? = null,
   @ColumnInfo(name = "is_encrypted", defaultValue = "-1") val isEncrypted: Boolean? = null,
   @ColumnInfo(name = "has_pgp", defaultValue = "0") val hasPgp: Boolean? = null,
+  @ColumnInfo(name = "thread_messages_count", defaultValue = "NULL") val threadMessagesCount: Int? = null,
 ) : Parcelable {
 
   @IgnoredOnParcel
@@ -199,6 +200,7 @@ data class MessageEntity(
     if (labelIds != other.labelIds) return false
     if (isEncrypted != other.isEncrypted) return false
     if (hasPgp != other.hasPgp) return false
+    if (threadMessagesCount != other.threadMessagesCount) return false
 
     return true
   }
@@ -229,6 +231,7 @@ data class MessageEntity(
     result = 31 * result + (labelIds?.hashCode() ?: 0)
     result = 31 * result + (isEncrypted?.hashCode() ?: 0)
     result = 31 * result + (hasPgp?.hashCode() ?: 0)
+    result = 31 * result + (threadMessagesCount?.hashCode() ?: 0)
     return result
   }
 
diff --git a/FlowCrypt/src/main/res/layout/messages_list_item.xml b/FlowCrypt/src/main/res/layout/messages_list_item.xml
index f87679f54..5525cf3f1 100644
--- a/FlowCrypt/src/main/res/layout/messages_list_item.xml
+++ b/FlowCrypt/src/main/res/layout/messages_list_item.xml
@@ -29,7 +29,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content_small"
-        android:ellipsize="end"
+        android:ellipsize="middle"
         android:maxLines="1"
         android:textColor="?attr/itemTitleColor"
         android:textSize="@dimen/default_text_size_big"