diff --git a/submodules/BrowserUI/Sources/Utils.swift b/submodules/BrowserUI/Sources/Utils.swift
index fe17f25240..3a479fde87 100644
--- a/submodules/BrowserUI/Sources/Utils.swift
+++ b/submodules/BrowserUI/Sources/Utils.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import Display
 import SwiftSignalKit
-import Postbox
 import TelegramCore
 import AccountContext
 import TextFormat
diff --git a/submodules/InstantPageUI/Sources/InstantPageController.swift b/submodules/InstantPageUI/Sources/InstantPageController.swift
index 716dc6a464..80cce10a66 100644
--- a/submodules/InstantPageUI/Sources/InstantPageController.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageController.swift
@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 import TelegramCore
-import Postbox
 import SwiftSignalKit
 import Display
 import TelegramPresentationData
diff --git a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
index 32db1d2948..9a606ab092 100644
--- a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
+++ b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
@@ -1,6 +1,5 @@
 import Foundation
 import UIKit
-import Postbox
 import SwiftSignalKit
 
 public final class CachedStickerAJpegRepresentation: CachedMediaResourceRepresentation {
diff --git a/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.swift b/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.swift
index cdafe9a37c..a4e19b1975 100644
--- a/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.swift
+++ b/submodules/PlatformRestrictionMatching/Sources/PlatformRestrictionMatching.swift
@@ -1,6 +1,5 @@
 import Foundation
 import TelegramCore
-import Postbox
 
 public extension Message {
     func isRestricted(platform: String, contentSettings: ContentSettings) -> Bool {
diff --git a/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift b/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift
index 9190c1d178..9ffa3fb2b2 100644
--- a/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift
+++ b/submodules/PremiumUI/Sources/PremiumBoostLevelsScreen.swift
@@ -3,7 +3,6 @@ import UIKit
 import Display
 import AsyncDisplayKit
 import TelegramCore
-import Postbox
 import SwiftSignalKit
 import AccountContext
 import TelegramPresentationData
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageRichDataBubbleContentNode/Sources/ChatMessageRichDataBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageRichDataBubbleContentNode/Sources/ChatMessageRichDataBubbleContentNode.swift
index a5e003fda8..599bf566ba 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageRichDataBubbleContentNode/Sources/ChatMessageRichDataBubbleContentNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageRichDataBubbleContentNode/Sources/ChatMessageRichDataBubbleContentNode.swift
@@ -683,6 +683,7 @@ public class ChatMessageRichDataBubbleContentNode: ChatMessageBubbleContentNode
                     ? messageItem.presentationData.theme.theme.chat.message.incoming.linkHighlightColor
                     : messageItem.presentationData.theme.theme.chat.message.outgoing.linkHighlightColor
                 highlightingNode = LinkHighlightingNode(color: color)
+                highlightingNode.useModernPathCalculation = true
                 self.linkHighlightingNode = highlightingNode
                 self.containerNode.insertSubnode(highlightingNode, at: 0)
             }
diff --git a/submodules/TelegramUI/Sources/Chat/ChatControllerPlayMessageEffect.swift b/submodules/TelegramUI/Sources/Chat/ChatControllerPlayMessageEffect.swift
index 62cbe695e2..fc8fd00154 100644
--- a/submodules/TelegramUI/Sources/Chat/ChatControllerPlayMessageEffect.swift
+++ b/submodules/TelegramUI/Sources/Chat/ChatControllerPlayMessageEffect.swift
@@ -2,7 +2,6 @@ import Foundation
 import UIKit
 import Display
 import SwiftSignalKit
-import Postbox
 import TelegramCore
 import TelegramUIPreferences
 import AccountContext
diff --git a/submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift b/submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift
index a29c5cb6f1..aa33bf57c3 100644
--- a/submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageThrottledProcessingManager.swift
@@ -1,6 +1,5 @@
 import Foundation
 import UIKit
-import Postbox
 import SwiftSignalKit
 
 final class ChatMessageThrottledProcessingManager {
diff --git a/submodules/TelegramUI/Sources/MakeTempAccountContext.swift b/submodules/TelegramUI/Sources/MakeTempAccountContext.swift
index 670abb783b..71dba3d413 100644
--- a/submodules/TelegramUI/Sources/MakeTempAccountContext.swift
+++ b/submodules/TelegramUI/Sources/MakeTempAccountContext.swift
@@ -1,7 +1,6 @@
 import Foundation
 import SwiftSignalKit
 import TelegramCore
-import Postbox
 import AccountContext
 import BuildConfig
 import TelegramPresentationData
diff --git a/submodules/TelegramUI/Sources/SaveMediaToFiles.swift b/submodules/TelegramUI/Sources/SaveMediaToFiles.swift
index af8c4a35b4..f644602b4c 100644
--- a/submodules/TelegramUI/Sources/SaveMediaToFiles.swift
+++ b/submodules/TelegramUI/Sources/SaveMediaToFiles.swift
@@ -2,7 +2,6 @@ import Foundation
 import AVFoundation
 import Display
 import SwiftSignalKit
-import Postbox
 import TelegramCore
 import AccountContext
 import OverlayStatusController
diff --git a/submodules/TelegramUIPreferences/Sources/RenderedTotalUnreadCount.swift b/submodules/TelegramUIPreferences/Sources/RenderedTotalUnreadCount.swift
index 613b51444e..09243edeac 100644
--- a/submodules/TelegramUIPreferences/Sources/RenderedTotalUnreadCount.swift
+++ b/submodules/TelegramUIPreferences/Sources/RenderedTotalUnreadCount.swift
@@ -1,5 +1,4 @@
 import Foundation
-import Postbox
 import TelegramCore
 import SwiftSignalKit