diff --git a/app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt
index 59121406..00083bae 100644
--- a/app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt
+++ b/app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt
@@ -27,9 +27,9 @@ data class VkMessage(
     @Ignore
     var attachments: List<VkAttachment>? = null
 
-    fun isUser() = id > 0
+    fun isUser() = fromId > 0
 
-    fun isGroup() = id < 0
+    fun isGroup() = fromId < 0
 
     fun getPreparedAction(): Action? {
         if (action == null) return null
diff --git a/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
index d6e19a47..01110a1b 100644
--- a/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
@@ -61,22 +61,18 @@ class ConversationsAdapter constructor(
 
             val chatUser: VkUser? = if (conversation.isUser()) {
                 profiles[conversation.id]
-//                profiles.find { it.id == conversation.id }
             } else null
 
             val messageUser: VkUser? = if (message.isUser()) {
                 profiles[message.fromId]
-//                profiles.find { it.id == message.fromId }
             } else null
 
             val chatGroup: VkGroup? = if (conversation.isGroup()) {
                 groups[conversation.id]
-//                groups.find { it.id == conversation.id }
             } else null
 
             val messageGroup: VkGroup? = if (message.isGroup()) {
                 groups[message.fromId]
-//                groups.find { it.id == message.fromId }
             } else null
 
             val avatar = when {
@@ -142,13 +138,14 @@ class ConversationsAdapter constructor(
             var prefix = when {
                 actionMessage != null -> ""
                 message.isOut -> "$youPrefix: "
-                messageUser != null && messageUser.firstName.isNotBlank() -> "${messageUser.firstName}: "
-                messageGroup != null && messageGroup.toString()
-                    .isNotBlank() -> "${messageGroup.name}: "
-                else -> ""
+                else -> {
+                    if (message.isUser() && messageUser != null && messageUser.firstName.isNotBlank()) "${messageUser.firstName}: "
+                    else if (message.isGroup() && messageGroup != null && messageGroup.name.isNotBlank()) "${messageGroup.name}: "
+                    else ""
+                }
             }
 
-            if (!conversation.isChat() && !message.isOut || conversation.id == UserConfig.userId)
+            if ((!conversation.isChat() && !message.isOut) || conversation.id == UserConfig.userId)
                 prefix = ""
 
 //            if (conversation.isChat() || message.isOut) {
diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index de60be02..969fe278 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -19,7 +19,7 @@
             android:orientation="horizontal"
             android:paddingVertical="8dp"
             android:paddingStart="8dp"
-            android:paddingEnd="12dp"
+            android:paddingEnd="32dp"
             tools:background="@drawable/ic_message_unread">
 
             <FrameLayout
@@ -151,6 +151,7 @@
                             android:layout_height="18dp"
                             android:layout_marginStart="8dp"
                             android:layout_marginTop="-4dp"
+                            android:layout_marginEnd="4dp"
                             android:layout_weight="0"
                             android:background="@drawable/ic_back"
                             android:backgroundTint="@color/a1_600"