diff --git a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
index 615e235577..df81250447 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
@@ -426,7 +426,7 @@ public class InfoItemNode: ListViewItemNode {
                 if let current = self.linkHighlightingNode {
                     linkHighlightingNode = current
                 } else {
-                    linkHighlightingNode = LinkHighlightingNode(color: item.presentationData.theme.list.itemAccentColor.withAlphaComponent(0.5))
+                    linkHighlightingNode = LinkHighlightingNode(color: item.presentationData.theme.list.itemAccentColor.withAlphaComponent(0.2))
                     self.linkHighlightingNode = linkHighlightingNode
                     self.insertSubnode(linkHighlightingNode, belowSubnode: self.textNode)
                 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index 8510f5b4f0..9b00eecb88 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -1206,11 +1206,13 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                     
                     if case let .replyThread(replyThreadMessage) = item.chatLocation, replyThreadMessage.messageId == replyAttribute.messageId {
                         hasReply = false
-                    } else if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
-                        hasReply = false
                     }
                     
-                    if case .peer = item.chatLocation, replyMessage.threadId != nil {
+                    if case .peer = item.chatLocation, replyMessage.threadId != nil, case let .peer(peerId) = item.chatLocation, peerId == replyMessage.id.peerId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
+                        if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId {
+                            hasReply = false
+                        }
+                        
                         threadInfoApply = makeThreadInfoLayout(ChatMessageThreadInfoNode.Arguments(
                             presentationData: item.presentationData,
                             strings: item.presentationData.strings,
diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
index 511567ca66..be0ba68e67 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
@@ -1963,8 +1963,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             }
             
             var hasReply = replyMessage != nil
-            if !isInstantVideo, let replyMessage = replyMessage, replyMessage.threadId != nil, case .peer = item.chatLocation {
-                if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
+            if !isInstantVideo, let replyMessage = replyMessage, replyMessage.threadId != nil, case let .peer(peerId) = item.chatLocation, peerId == replyMessage.id.peerId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
+                if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId {
                     hasReply = false
                 }
                     
diff --git a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
index 43513a990e..a3a2ea0afd 100644
--- a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
@@ -635,11 +635,12 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                     
                     if case let .replyThread(replyThreadMessage) = item.chatLocation, replyThreadMessage.messageId == replyAttribute.messageId {
                         hasReply = false
-                    } else if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
-                        hasReply = false
                     }
                     
-                    if case .peer = item.chatLocation, replyMessage.threadId != nil {
+                    if case .peer = item.chatLocation, replyMessage.threadId != nil, case let .peer(peerId) = item.chatLocation, peerId == replyMessage.id.peerId, let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, channel.flags.contains(.isForum) {
+                        if let threadId = item.message.threadId, Int64(replyMessage.id.id) == threadId {
+                            hasReply = false
+                        }
                         threadInfoApply = makeThreadInfoLayout(ChatMessageThreadInfoNode.Arguments(
                             presentationData: item.presentationData,
                             strings: item.presentationData.strings,
diff --git a/submodules/TelegramUI/Sources/ChatMessageThreadInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageThreadInfoNode.swift
index 3763acfcad..fb2e900cd7 100644
--- a/submodules/TelegramUI/Sources/ChatMessageThreadInfoNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageThreadInfoNode.swift
@@ -275,8 +275,10 @@ class ChatMessageThreadInfoNode: ASDisplayNode {
         
         self.contentNode.highligthedChanged = { [weak self] highlighted in
             if let strongSelf = self {
-                if highlighted {
-                    strongSelf.contentNode.layer.animateScale(from: 1.0, to: 0.96, duration: 0.15, removeOnCompletion: false)
+                if highlighted, !strongSelf.frame.width.isZero {
+                    let scale = (strongSelf.frame.width - 10.0) / strongSelf.frame.width
+                    
+                    strongSelf.contentNode.layer.animateScale(from: 1.0, to: scale, duration: 0.15, removeOnCompletion: false)
                     
                     strongSelf.contentBackgroundNode.layer.removeAnimation(forKey: "opacity")
                     strongSelf.contentBackgroundNode.alpha = 0.2
@@ -358,8 +360,10 @@ class ChatMessageThreadInfoNode: ASDisplayNode {
             var lineRects = textLayout.linesRects().map { rect in
                 return CGRect(origin: rect.origin.offsetBy(dx: insets.left, dy: 0.0), size: CGSize(width: rect.width + iconSize.width + spacing + 3.0, height: rect.size.height))
             }
-            let lastRect = lineRects[lineRects.count - 1]
-            lineRects[lineRects.count - 1] = CGRect(origin: lastRect.origin, size: CGSize(width: lastRect.width + 11.0, height: lastRect.height))
+            if lineRects.count > 0 {
+                let lastRect = lineRects[lineRects.count - 1]
+                lineRects[lineRects.count - 1] = CGRect(origin: lastRect.origin, size: CGSize(width: lastRect.width + 11.0, height: lastRect.height))
+            }
             
             let size = CGSize(width: insets.left + iconSize.width + spacing + textLayout.size.width + insets.right + lineInset * 2.0, height: insets.top + textLayout.size.height + insets.bottom)