diff --git a/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift b/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
index 99ac51137c..fdf79ae74c 100644
--- a/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
+++ b/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
@@ -1240,6 +1240,11 @@ public final class ListMessageFileItemNode: ListMessageNode {
                         if strongSelf.maskNode.supernode != nil {
                             strongSelf.maskNode.removeFromSupernode()
                         }
+                        if !mergedBottom {
+                            strongSelf.separatorNode.isHidden = true
+                        } else {
+                            strongSelf.separatorNode.isHidden = false
+                        }
                     case .blocks:
                         if strongSelf.maskNode.supernode == nil {
                             strongSelf.addSubnode(strongSelf.maskNode)
diff --git a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift
index 8a8b05bcef..3497f3aa66 100644
--- a/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift
+++ b/submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/PeerInfoVisualMediaPaneNode.swift
@@ -1698,6 +1698,14 @@ public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode,
                 guard let strongSelf = self, let itemView = item.view as? ItemView else {
                     return
                 }
+                var isList = false
+                switch strongSelf.contentType {
+                case .files, .music, .voiceAndVideoMessages:
+                    isList = true
+                default:
+                    break
+                }
+                let listSideInset = isList ? (sideInset + 16.0) : sideInset
                 if let item = itemView.item {
                     itemView.bind(
                         item: item,
@@ -1707,7 +1715,7 @@ public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode,
                         interaction: strongSelf.itemGridBinding.listItemInteraction,
                         isSelected: strongSelf.chatControllerInteraction.selectionState?.selectedIds.contains(item.message.id),
                         size: CGSize(width: size.width, height: itemView.bounds.height),
-                        insets: UIEdgeInsets(top: topInset, left: sideInset, bottom: bottomInset, right: sideInset)
+                        insets: UIEdgeInsets(top: topInset, left: listSideInset, bottom: bottomInset, right: listSideInset)
                     )
                 }
             }
@@ -2137,6 +2145,14 @@ public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode,
                 guard let itemView = item.view as? ItemView, let (size, topInset, sideInset, bottomInset, _, _, _, _, _, _) = self.currentParams else {
                     return
                 }
+                var isList = false
+                switch self.contentType {
+                case .files, .music, .voiceAndVideoMessages:
+                    isList = true
+                default:
+                    break
+                }
+                let listSideInset = isList ? (sideInset + 16.0) : sideInset
                 if let item = itemView.item {
                     itemView.bind(
                         item: item,
@@ -2146,7 +2162,7 @@ public final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode,
                         interaction: self.itemGridBinding.listItemInteraction,
                         isSelected: self.chatControllerInteraction.selectionState?.selectedIds.contains(item.message.id),
                         size: CGSize(width: size.width, height: itemView.bounds.height),
-                        insets: UIEdgeInsets(top: topInset, left: sideInset, bottom: bottomInset, right: sideInset)
+                        insets: UIEdgeInsets(top: topInset, left: listSideInset, bottom: bottomInset, right: listSideInset)
                     )
                 }
             }