diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
index 6f41313dac..9bda993d6b 100644
--- a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift
@@ -39,7 +39,8 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
         
         var contentTypeHint: ChatMessageEntryContentType = .generic
         if presentationData.largeEmoji {
-            if let _ = associatedData.animatedEmojiStickers[entry.message.text.basicEmoji.0] {
+            let messageText = entry.message.text
+            if messageText.count == 1, let _ = associatedData.animatedEmojiStickers[messageText.basicEmoji.0] {
                 contentTypeHint = .animatedEmoji
             } else if messageIsElligibleForLargeEmoji(entry.message) {
                 contentTypeHint = .largeEmoji
diff --git a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
index 32c3535f45..6f00f6b78c 100644
--- a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
+++ b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
@@ -152,12 +152,4 @@ extension String {
         }
         return (string, fitzModifier)
     }
-    
-    var trimmedEmoji: String {
-        if self.unicodeScalars.count > 1, self.unicodeScalars.first?.value == 0x2764, self.emojis.count == 1 {
-            return String(self.unicodeScalars.prefix(self.unicodeScalars.count - 1))
-        } else {
-            return self
-        }
-    }
 }