diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 3c54cc8799..2b033d64a4 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -1059,7 +1059,22 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                 currentSecretIconImage = PresentationResourcesChatList.secretIcon(item.presentationData.theme)
             }
             var credibilityIconOffset: CGFloat = 0.0
-            if case let .chat(itemPeer) = contentPeer, let peer = itemPeer.chatMainPeer {
+            if displayAsMessage {
+                switch item.content {
+                case let .peer(message, _, _, _, _, _, _, _, _, _, _):
+                    if let peer = message?.author {
+                        if peer.isScam {
+                            currentCredibilityIconImage = PresentationResourcesChatList.scamIcon(item.presentationData.theme, type: .regular)
+                            credibilityIconOffset = 2.0
+                        } else if peer.isVerified {
+                            currentCredibilityIconImage = PresentationResourcesChatList.verifiedIcon(item.presentationData.theme)
+                            credibilityIconOffset = 3.0
+                        }
+                    }
+                default:
+                    break
+                }
+            } else if case let .chat(itemPeer) = contentPeer, let peer = itemPeer.chatMainPeer {
                 if peer.isScam {
                     currentCredibilityIconImage = PresentationResourcesChatList.scamIcon(item.presentationData.theme, type: .regular)
                     credibilityIconOffset = 2.0