diff --git a/submodules/Emoji/Sources/EmojiUtils.swift b/submodules/Emoji/Sources/EmojiUtils.swift
index 4d393fdb6b..50924083bf 100644
--- a/submodules/Emoji/Sources/EmojiUtils.swift
+++ b/submodules/Emoji/Sources/EmojiUtils.swift
@@ -5,7 +5,7 @@ import AVFoundation
 extension Character {
     var isSimpleEmoji: Bool {
         guard let firstScalar = unicodeScalars.first else { return false }
-        if #available(iOS 10.2, *) {
+        if #available(iOS 10.2, macOS 10.12.2, *) {
             return (firstScalar.properties.isEmoji && firstScalar.value > 0x238C) || firstScalar.isEmoji
         } else {
             return firstScalar.isEmoji
@@ -13,7 +13,7 @@ extension Character {
     }
 
     var isCombinedIntoEmoji: Bool {
-        if #available(iOS 10.2, *) {
+        if #available(iOS 10.2, macOS 10.12.2, *) {
             return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.properties.isEmoji ?? false
         } else {
             return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.isEmoji ?? false
diff --git a/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift b/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
index 4330fb5ab9..f8fc35f735 100644
--- a/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
@@ -302,7 +302,7 @@ public func resendMessages(account: Account, messageIds: [MessageId]) -> Signal<
                         }
                     }
 
-                    if let forwardSource {
+                    if let forwardSource = forwardSource {
                         messages.append(.forward(source: forwardSource, threadId: nil, grouping: .auto, attributes: filteredAttributes, correlationId: nil))
                     } else {
                         messages.append(.message(text: message.text, attributes: filteredAttributes, inlineStickers: [:], mediaReference: message.media.first.flatMap(AnyMediaReference.standalone), replyToMessageId: replyToMessageId, localGroupingKey: message.groupingKey, correlationId: nil, bubbleUpEmojiOrStickersets: bubbleUpEmojiOrStickersets))