diff --git a/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift b/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
index 27180144c2..09050255eb 100644
--- a/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
+++ b/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
@@ -68,7 +68,7 @@ private enum ResetPasswordEntry: ItemListNodeEntry, Equatable {
     func item(_ arguments: ResetPasswordControllerArguments) -> ListViewItem {
         switch self {
             case let .code(theme, strings, text, value):
-                return ItemListSingleLineInputItem(theme: theme, strings: strings, title: NSAttributedString(string: text), text: value, placeholder: "", type: .number, spacing: 10.0, tag: ResetPasswordEntryTag.code, sectionId: self.section, textUpdated: { updatedText in
+                return ItemListSingleLineInputItem(theme: theme, strings: strings, title: NSAttributedString(string: text, textColor: theme.list.itemPrimaryTextColor), text: value, placeholder: "", type: .number, spacing: 10.0, tag: ResetPasswordEntryTag.code, sectionId: self.section, textUpdated: { updatedText in
                     arguments.updateCodeText(updatedText)
                 }, action: {
                 })
diff --git a/submodules/TelegramUI/TelegramUI/Bridge Audio/TGBridgeAudioEncoder.m b/submodules/TelegramUI/TelegramUI/Bridge Audio/TGBridgeAudioEncoder.m
index 0177caaffa..c2a137bfc0 100644
--- a/submodules/TelegramUI/TelegramUI/Bridge Audio/TGBridgeAudioEncoder.m	
+++ b/submodules/TelegramUI/TelegramUI/Bridge Audio/TGBridgeAudioEncoder.m	
@@ -121,7 +121,7 @@ typedef enum {
     return queue;
 }
 
-static const int encoderPacketSizeInBytes = TGBridgeAudioEncoderSampleRate / 1000 * 60 * 2;
+static const int encoderPacketSizeInBytes = 16000 / 1000 * 60 * 2;
 
 - (void)startWithCompletion:(void (^)(NSString *, int32_t))completion
 {
diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
index ae825912ff..ea364c24e0 100644
--- a/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatMessageItem.swift
@@ -401,10 +401,10 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
             }
         }
         
-        if viewClassName == ChatMessageBubbleItemNode.self && self.presentationData.largeEmoji && messageIsElligibleForLargeEmoji(self.message) {
-            if let _ = self.associatedData.animatedEmojiStickers[self.message.text.basicEmoji.0] {
+        if viewClassName == ChatMessageBubbleItemNode.self && self.presentationData.largeEmoji {
+            if self.message.text.count == 1, let _ = self.associatedData.animatedEmojiStickers[self.message.text.basicEmoji.0] {
                 viewClassName = ChatMessageAnimatedStickerItemNode.self
-            } else {
+            } else if messageIsElligibleForLargeEmoji(self.message) {
                 viewClassName = ChatMessageStickerItemNode.self
             }
         }
diff --git a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
index 32c3535f45..42cc09e558 100644
--- a/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
+++ b/submodules/TelegramUI/TelegramUI/EmojiUtils.swift
@@ -19,8 +19,6 @@ extension UnicodeScalar {
                 return true
             case 0x1f004:
                 return true
-            case 0x2764:
-                return true
             case 0x270b, 0x2728:
                 return true
             default:
@@ -152,12 +150,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
-        }
-    }
 }