diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
index 20bd0ca304..d6a15bfd57 100644
--- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
+++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
@@ -607,7 +607,7 @@ private func peerInfoPersonalChannel(context: AccountContext, peerId: EnginePeer
                 for i in (0 ..< view.entries.count).reversed() {
                     if messages.isEmpty {
                         messages.append(EngineMessage(view.entries[i].message))
-                    } else if messages[0].groupingKey == view.entries[i].message.groupingKey {
+                    } else if messages[0].groupingKey != nil && messages[0].groupingKey == view.entries[i].message.groupingKey {
                         messages.append(EngineMessage(view.entries[i].message))
                     }
                 }
diff --git a/submodules/TelegramUI/Sources/ChatBusinessLinkTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatBusinessLinkTitlePanelNode.swift
index 25a73ef5c7..fbe13ebdb1 100644
--- a/submodules/TelegramUI/Sources/ChatBusinessLinkTitlePanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatBusinessLinkTitlePanelNode.swift
@@ -78,7 +78,7 @@ private final class ChatBusinessLinkTitlePanelComponent: Component {
                 transition: transition,
                 component: AnyComponent(PlainButtonComponent(
                     content: AnyComponent(MultilineTextComponent(
-                        text: .plain(NSAttributedString(string: "Copy Link", font: Font.regular(17.0), textColor: component.theme.rootController.navigationBar.accentTextColor))
+                        text: .plain(NSAttributedString(string: component.strings.GroupInfo_InviteLink_CopyLink, font: Font.regular(17.0), textColor: component.theme.rootController.navigationBar.accentTextColor))
                     )),
                     effectAlignment: .center,
                     minSize: CGSize(width: floor(availableSize.width * 0.5), height: size.height),
@@ -107,7 +107,7 @@ private final class ChatBusinessLinkTitlePanelComponent: Component {
                 transition: transition,
                 component: AnyComponent(PlainButtonComponent(
                     content: AnyComponent(MultilineTextComponent(
-                        text: .plain(NSAttributedString(string: "Share Link", font: Font.regular(17.0), textColor: component.theme.rootController.navigationBar.accentTextColor))
+                        text: .plain(NSAttributedString(string: component.strings.GroupInfo_InviteLink_ShareLink, font: Font.regular(17.0), textColor: component.theme.rootController.navigationBar.accentTextColor))
                     )),
                     effectAlignment: .center,
                     minSize: CGSize(width: floor(availableSize.width * 0.5), height: size.height),