diff --git a/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
index 329080b595..2ce93f285c 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
@@ -349,7 +349,7 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
                     snapshotImageNode = imageNode
                 case let .animated(resource, _):
                     let animatedStickerNode = AnimatedStickerNode()
-                    animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: 128, height: 128, mode: .direct(cachePathPrefix: nil))
+                    animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: 128, height: 128, mode: .cached)
                     animatedStickerNode.visibility = self.visibilityStatus && loopAnimatedStickers
                     scalingNode.addSubnode(animatedStickerNode)
                     
diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
index 71a31ddc6d..ff1afcb8a4 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
@@ -3560,7 +3560,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         
         if let selectionState = item.controllerInteraction.selectionState, canHaveSelection {
             var selected = false
-            var incoming = true
+            let incoming = item.content.effectivelyIncoming(item.context.account.peerId, associatedData: item.associatedData)
             
             switch item.content {
                 case let .message(message, _, _, _):
@@ -3576,8 +3576,6 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     selected = allSelected
             }
             
-            incoming = item.message.effectivelyIncoming(item.context.account.peerId)
-            
             let offset: CGFloat = incoming ? 42.0 : 0.0
             
             if let selectionNode = self.selectionNode {
diff --git a/submodules/TelegramUI/Sources/StickerPaneTrendingListGridItem.swift b/submodules/TelegramUI/Sources/StickerPaneTrendingListGridItem.swift
index 72522260f3..718cfde189 100644
--- a/submodules/TelegramUI/Sources/StickerPaneTrendingListGridItem.swift
+++ b/submodules/TelegramUI/Sources/StickerPaneTrendingListGridItem.swift
@@ -278,13 +278,15 @@ private final class FeaturedPackItemNode: ListViewItemNode {
                         self.imageNode.setSignal(chatMessageStickerPackThumbnail(postbox: account.postbox, resource: resource, animated: true, nilIfEmpty: true))
                         
                         let loopAnimatedStickers = self.inputNodeInteraction?.stickerSettings?.loopAnimatedStickers ?? false
-                        self.imageNode.isHidden = loopAnimatedStickers
                         
                         let animatedStickerNode: AnimatedStickerNode
                         if let current = self.animatedStickerNode {
                             animatedStickerNode = current
                         } else {
                             animatedStickerNode = AnimatedStickerNode()
+                            animatedStickerNode.started = { [weak self] in
+                                self?.imageNode.isHidden = true
+                            }
                             self.animatedStickerNode = animatedStickerNode
                             if let placeholderNode = self.placeholderNode {
                                 self.containerNode.insertSubnode(animatedStickerNode, belowSubnode: placeholderNode)