diff --git a/submodules/ComposePollUI/Sources/CreatePollController.swift b/submodules/ComposePollUI/Sources/CreatePollController.swift
index b964e37bdd..e157558914 100644
--- a/submodules/ComposePollUI/Sources/CreatePollController.swift
+++ b/submodules/ComposePollUI/Sources/CreatePollController.swift
@@ -427,7 +427,7 @@ private struct CreatePollControllerState: Equatable {
     var isEditingSolution: Bool = false
 }
 
-private func createPollControllerEntries(presentationData: PresentationData, peer: EnginePeer, state: CreatePollControllerState, limitsConfiguration: EngineConfiguration.Limits, defaultIsQuiz: Bool?) -> [CreatePollEntry] {
+private func createPollControllerEntries(presentationData: PresentationData, peer: EnginePeer, state: CreatePollControllerState, limitsConfiguration: EngineConfiguration.UserLimits, defaultIsQuiz: Bool?) -> [CreatePollEntry] {
     var entries: [CreatePollEntry] = []
     
     var textLimitText = ItemListSectionHeaderAccessoryText(value: "", color: .generic)
@@ -436,7 +436,7 @@ private func createPollControllerEntries(presentationData: PresentationData, pee
         textLimitText = ItemListSectionHeaderAccessoryText(value: "\(remainingCount)", color: remainingCount < 0 ? .destructive : .generic)
     }
     entries.append(.textHeader(presentationData.strings.CreatePoll_TextHeader, textLimitText))
-    entries.append(.text(presentationData.strings.CreatePoll_TextPlaceholder, state.text, Int(limitsConfiguration.maxMediaCaptionLength)))
+    entries.append(.text(presentationData.strings.CreatePoll_TextPlaceholder, state.text, Int(limitsConfiguration.maxCaptionLength)))
     let optionsHeaderTitle: String
     if let defaultIsQuiz = defaultIsQuiz, defaultIsQuiz {
         optionsHeaderTitle = presentationData.strings.CreatePoll_QuizOptionsHeader
@@ -866,7 +866,7 @@ public func createPollController(context: AccountContext, updatedPresentationDat
     let signal = combineLatest(queue: .mainQueue(),
         presentationData,
         statePromise.get(),
-        context.engine.data.subscribe(TelegramEngine.EngineData.Item.Configuration.Limits())
+        context.engine.data.subscribe(TelegramEngine.EngineData.Item.Configuration.UserLimits(isPremium: false))
     )
     |> map { presentationData, state, limitsConfiguration -> (ItemListControllerState, (ItemListNodeState, Any)) in
         var presentationData = presentationData
diff --git a/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
index a4bef755a9..2bbf5284a2 100644
--- a/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
@@ -14,7 +14,7 @@ func managedConfigurationUpdates(accountManager: AccountManager<TelegramAccountM
         |> mapToSignal { result, defaultHistoryTtl -> Signal<Void, NoError> in
             return postbox.transaction { transaction -> Signal<Void, NoError> in
                 switch result {
-                case let .config(flags, _, _, _, _, dcOptions, _, chatSizeMax, megagroupSizeMax, forwardedCountMax, _, _, _, _, _, _, _, _, editTimeLimit, revokeTimeLimit, revokePmTimeLimit, _, stickersRecentLimit, _, _, _, _, _, _, _, autoupdateUrlPrefix, gifSearchUsername, venueSearchUsername, imgSearchUsername, _, captionLengthMax, _, webfileDcId, suggestedLangCode, langPackVersion, baseLangPackVersion, reactionsDefault, autologinToken):
+                case let .config(flags, _, _, _, _, dcOptions, _, chatSizeMax, megagroupSizeMax, forwardedCountMax, _, _, _, _, _, _, _, _, editTimeLimit, revokeTimeLimit, revokePmTimeLimit, _, stickersRecentLimit, _, _, _, _, _, _, _, autoupdateUrlPrefix, gifSearchUsername, venueSearchUsername, imgSearchUsername, _, _, _, webfileDcId, suggestedLangCode, langPackVersion, baseLangPackVersion, reactionsDefault, autologinToken):
                     var addressList: [Int: [MTDatacenterAddress]] = [:]
                     for option in dcOptions {
                         switch option {
@@ -61,7 +61,7 @@ func managedConfigurationUpdates(accountManager: AccountManager<TelegramAccountM
                         return entry
                     })
                     
-                    updateLimitsConfiguration(transaction: transaction, configuration: LimitsConfiguration(maxPinnedChatCount: 5, maxArchivedPinnedChatCount: 5, maxGroupMemberCount: chatSizeMax, maxSupergroupMemberCount: megagroupSizeMax, maxMessageForwardBatchSize: forwardedCountMax, maxSavedGifCount: 10, maxRecentStickerCount: stickersRecentLimit, maxFavedStickerCount: 10, maxMessageEditingInterval: editTimeLimit, maxMediaCaptionLength: captionLengthMax, canRemoveIncomingMessagesInPrivateChats: (flags & (1 << 6)) != 0, maxMessageRevokeInterval: revokeTimeLimit, maxMessageRevokeIntervalInPrivateChats: revokePmTimeLimit))
+                    updateLimitsConfiguration(transaction: transaction, configuration: LimitsConfiguration(maxGroupMemberCount: chatSizeMax, maxSupergroupMemberCount: megagroupSizeMax, maxMessageForwardBatchSize: forwardedCountMax, maxRecentStickerCount: stickersRecentLimit, maxMessageEditingInterval: editTimeLimit, canRemoveIncomingMessagesInPrivateChats: (flags & (1 << 6)) != 0, maxMessageRevokeInterval: revokeTimeLimit, maxMessageRevokeIntervalInPrivateChats: revokePmTimeLimit))
                     
                     updateSearchBotsConfiguration(transaction: transaction, configuration: SearchBotsConfiguration(imageBotUsername: imgSearchUsername, gifBotUsername: gifSearchUsername, venueBotUsername: venueSearchUsername))
                 
diff --git a/submodules/TelegramCore/Sources/State/UserLimitsConfiguration.swift b/submodules/TelegramCore/Sources/State/UserLimitsConfiguration.swift
index 6b967aa477..f81eb629ef 100644
--- a/submodules/TelegramCore/Sources/State/UserLimitsConfiguration.swift
+++ b/submodules/TelegramCore/Sources/State/UserLimitsConfiguration.swift
@@ -3,6 +3,7 @@ import SwiftSignalKit
 
 public struct UserLimitsConfiguration: Equatable {
     public let maxPinnedChatCount: Int32
+    public let maxArchivedPinnedChatCount: Int32
     public let maxChannelsCount: Int32
     public let maxPublicLinksCount: Int32
     public let maxSavedGifCount: Int32
@@ -18,6 +19,7 @@ public struct UserLimitsConfiguration: Equatable {
     public static var defaultValue: UserLimitsConfiguration {
         return UserLimitsConfiguration(
             maxPinnedChatCount: 5,
+            maxArchivedPinnedChatCount: 100,
             maxChannelsCount: 500,
             maxPublicLinksCount: 10,
             maxSavedGifCount: 200,
@@ -34,6 +36,7 @@ public struct UserLimitsConfiguration: Equatable {
 
     public init(
         maxPinnedChatCount: Int32,
+        maxArchivedPinnedChatCount: Int32,
         maxChannelsCount: Int32,
         maxPublicLinksCount: Int32,
         maxSavedGifCount: Int32,
@@ -47,6 +50,7 @@ public struct UserLimitsConfiguration: Equatable {
         maxReactionsPerMessage: Int32
     ) {
         self.maxPinnedChatCount = maxPinnedChatCount
+        self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
         self.maxChannelsCount = maxChannelsCount
         self.maxPublicLinksCount = maxPublicLinksCount
         self.maxSavedGifCount = maxSavedGifCount
@@ -83,6 +87,7 @@ extension UserLimitsConfiguration {
         }
         
         self.maxPinnedChatCount = getValue("dialogs_pinned_limit", orElse: defaultValue.maxPinnedChatCount)
+        self.maxArchivedPinnedChatCount = getValue("dialogs_folder_pinned_limit", orElse: defaultValue.maxArchivedPinnedChatCount)
         self.maxChannelsCount = getValue("channels_limit", orElse: defaultValue.maxChannelsCount)
         self.maxPublicLinksCount = getValue("channels_public_limit", orElse: defaultValue.maxPublicLinksCount)
         self.maxSavedGifCount = getValue("saved_gifs_limit", orElse: defaultValue.maxSavedGifCount)
diff --git a/submodules/TelegramCore/Sources/SyncCore/SyncCore_LimitsConfiguration.swift b/submodules/TelegramCore/Sources/SyncCore/SyncCore_LimitsConfiguration.swift
index 9da220d09b..e1280b9d5d 100644
--- a/submodules/TelegramCore/Sources/SyncCore/SyncCore_LimitsConfiguration.swift
+++ b/submodules/TelegramCore/Sources/SyncCore/SyncCore_LimitsConfiguration.swift
@@ -3,35 +3,25 @@ import Postbox
 public struct LimitsConfiguration: Codable, Equatable {
     public static let timeIntervalForever: Int32 = 0x7fffffff
     
-    public var maxPinnedChatCount: Int32
-    public var maxArchivedPinnedChatCount: Int32
     public var maxGroupMemberCount: Int32
     public var maxSupergroupMemberCount: Int32
     public var maxMessageForwardBatchSize: Int32
-    public var maxSavedGifCount: Int32
     public var maxRecentStickerCount: Int32
-    public var maxFavedStickerCount: Int32
     public var maxMessageEditingInterval: Int32
-    public var maxMediaCaptionLength: Int32
     public var canRemoveIncomingMessagesInPrivateChats: Bool
     public var maxMessageRevokeInterval: Int32
     public var maxMessageRevokeIntervalInPrivateChats: Int32
     
     public static var defaultValue: LimitsConfiguration {
-        return LimitsConfiguration(maxPinnedChatCount: 5, maxArchivedPinnedChatCount: 20, maxGroupMemberCount: 200, maxSupergroupMemberCount: 200000, maxMessageForwardBatchSize: 50, maxSavedGifCount: 200, maxRecentStickerCount: 20, maxFavedStickerCount: 5, maxMessageEditingInterval: 2 * 24 * 60 * 60, maxMediaCaptionLength: 1000, canRemoveIncomingMessagesInPrivateChats: false, maxMessageRevokeInterval: 2 * 24 * 60 * 60, maxMessageRevokeIntervalInPrivateChats: 2 * 24 * 60 * 60)
+        return LimitsConfiguration(maxGroupMemberCount: 200, maxSupergroupMemberCount: 200000, maxMessageForwardBatchSize: 50, maxRecentStickerCount: 20, maxMessageEditingInterval: 2 * 24 * 60 * 60, canRemoveIncomingMessagesInPrivateChats: false, maxMessageRevokeInterval: 2 * 24 * 60 * 60, maxMessageRevokeIntervalInPrivateChats: 2 * 24 * 60 * 60)
     }
     
-    public init(maxPinnedChatCount: Int32, maxArchivedPinnedChatCount: Int32, maxGroupMemberCount: Int32, maxSupergroupMemberCount: Int32, maxMessageForwardBatchSize: Int32, maxSavedGifCount: Int32, maxRecentStickerCount: Int32, maxFavedStickerCount: Int32, maxMessageEditingInterval: Int32, maxMediaCaptionLength: Int32, canRemoveIncomingMessagesInPrivateChats: Bool, maxMessageRevokeInterval: Int32, maxMessageRevokeIntervalInPrivateChats: Int32) {
-        self.maxPinnedChatCount = maxPinnedChatCount
-        self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
+    public init(maxGroupMemberCount: Int32, maxSupergroupMemberCount: Int32, maxMessageForwardBatchSize: Int32, maxRecentStickerCount: Int32, maxMessageEditingInterval: Int32, canRemoveIncomingMessagesInPrivateChats: Bool, maxMessageRevokeInterval: Int32, maxMessageRevokeIntervalInPrivateChats: Int32) {
         self.maxGroupMemberCount = maxGroupMemberCount
         self.maxSupergroupMemberCount = maxSupergroupMemberCount
         self.maxMessageForwardBatchSize = maxMessageForwardBatchSize
-        self.maxSavedGifCount = maxSavedGifCount
         self.maxRecentStickerCount = maxRecentStickerCount
-        self.maxFavedStickerCount = maxFavedStickerCount
         self.maxMessageEditingInterval = maxMessageEditingInterval
-        self.maxMediaCaptionLength = maxMediaCaptionLength
         self.canRemoveIncomingMessagesInPrivateChats = canRemoveIncomingMessagesInPrivateChats
         self.maxMessageRevokeInterval = maxMessageRevokeInterval
         self.maxMessageRevokeIntervalInPrivateChats = maxMessageRevokeIntervalInPrivateChats
@@ -40,16 +30,11 @@ public struct LimitsConfiguration: Codable, Equatable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: StringCodingKey.self)
 
-        self.maxPinnedChatCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxPinnedChatCount")) ?? 5
-        self.maxArchivedPinnedChatCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxArchivedPinnedChatCount")) ?? 20
         self.maxGroupMemberCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxGroupMemberCount")) ?? 200
         self.maxSupergroupMemberCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxSupergroupMemberCount")) ?? 5000
         self.maxMessageForwardBatchSize = (try? container.decodeIfPresent(Int32.self, forKey: "maxMessageForwardBatchSize")) ?? 50
-        self.maxSavedGifCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxSavedGifCount")) ?? 200
         self.maxRecentStickerCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxRecentStickerCount")) ?? 20
-        self.maxFavedStickerCount = (try? container.decodeIfPresent(Int32.self, forKey: "maxFavedStickerCount")) ?? 5
         self.maxMessageEditingInterval = (try? container.decodeIfPresent(Int32.self, forKey: "maxMessageEditingInterval")) ?? (2 * 24 * 60 * 60)
-        self.maxMediaCaptionLength = (try? container.decodeIfPresent(Int32.self, forKey: "maxMediaCaptionLength")) ?? 1000
         self.canRemoveIncomingMessagesInPrivateChats = (try? container.decodeIfPresent(Int32.self, forKey: "canRemoveIncomingMessagesInPrivateChats") ?? 0) != 0
         self.maxMessageRevokeInterval = (try? container.decodeIfPresent(Int32.self, forKey: "maxMessageRevokeInterval")) ?? (2 * 24 * 60 * 60)
         self.maxMessageRevokeIntervalInPrivateChats = (try? container.decodeIfPresent(Int32.self, forKey: "maxMessageRevokeIntervalInPrivateChats")) ?? (2 * 24 * 60 * 60)
@@ -58,16 +43,11 @@ public struct LimitsConfiguration: Codable, Equatable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: StringCodingKey.self)
 
-        try container.encode(self.maxPinnedChatCount, forKey: "maxPinnedChatCount")
-        try container.encode(self.maxArchivedPinnedChatCount, forKey: "maxArchivedPinnedChatCount")
         try container.encode(self.maxGroupMemberCount, forKey: "maxGroupMemberCount")
         try container.encode(self.maxSupergroupMemberCount, forKey: "maxSupergroupMemberCount")
         try container.encode(self.maxMessageForwardBatchSize, forKey: "maxMessageForwardBatchSize")
-        try container.encode(self.maxSavedGifCount, forKey: "maxSavedGifCount")
         try container.encode(self.maxRecentStickerCount, forKey: "maxRecentStickerCount")
-        try container.encode(self.maxFavedStickerCount, forKey: "maxFavedStickerCount")
         try container.encode(self.maxMessageEditingInterval, forKey: "maxMessageEditingInterval")
-        try container.encode(self.maxMediaCaptionLength, forKey: "maxMediaCaptionLength")
         try container.encode((self.canRemoveIncomingMessagesInPrivateChats ? 1 : 0) as Int32, forKey: "canRemoveIncomingMessagesInPrivateChats")
         try container.encode(self.maxMessageRevokeInterval, forKey: "maxMessageRevokeInterval")
         try container.encode(self.maxMessageRevokeIntervalInPrivateChats, forKey: "maxMessageRevokeIntervalInPrivateChats")
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Data/ConfigurationData.swift b/submodules/TelegramCore/Sources/TelegramEngine/Data/ConfigurationData.swift
index 75a1b7e633..09f322077f 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Data/ConfigurationData.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Data/ConfigurationData.swift
@@ -5,45 +5,30 @@ public enum EngineConfiguration {
     public struct Limits: Equatable {
         public static let timeIntervalForever: Int32 = 0x7fffffff
         
-        public var maxPinnedChatCount: Int32
-        public var maxArchivedPinnedChatCount: Int32
         public var maxGroupMemberCount: Int32
         public var maxSupergroupMemberCount: Int32
         public var maxMessageForwardBatchSize: Int32
-        public var maxSavedGifCount: Int32
-        public var maxFavedStickerCount: Int32
         public var maxRecentStickerCount: Int32
         public var maxMessageEditingInterval: Int32
-        public var maxMediaCaptionLength: Int32
         public var canRemoveIncomingMessagesInPrivateChats: Bool
         public var maxMessageRevokeInterval: Int32
         public var maxMessageRevokeIntervalInPrivateChats: Int32
 
         public init(
-            maxPinnedChatCount: Int32,
-            maxArchivedPinnedChatCount: Int32,
             maxGroupMemberCount: Int32,
             maxSupergroupMemberCount: Int32,
             maxMessageForwardBatchSize: Int32,
-            maxSavedGifCount: Int32,
-            maxFavedStickerCount: Int32,
             maxRecentStickerCount: Int32,
             maxMessageEditingInterval: Int32,
-            maxMediaCaptionLength: Int32,
             canRemoveIncomingMessagesInPrivateChats: Bool,
             maxMessageRevokeInterval: Int32,
             maxMessageRevokeIntervalInPrivateChats: Int32
         ) {
-            self.maxPinnedChatCount = maxPinnedChatCount
-            self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
             self.maxGroupMemberCount = maxGroupMemberCount
             self.maxSupergroupMemberCount = maxSupergroupMemberCount
             self.maxMessageForwardBatchSize = maxMessageForwardBatchSize
-            self.maxSavedGifCount = maxSavedGifCount
-            self.maxFavedStickerCount = maxFavedStickerCount
             self.maxRecentStickerCount = maxRecentStickerCount
             self.maxMessageEditingInterval = maxMessageEditingInterval
-            self.maxMediaCaptionLength = maxMediaCaptionLength
             self.canRemoveIncomingMessagesInPrivateChats = canRemoveIncomingMessagesInPrivateChats
             self.maxMessageRevokeInterval = maxMessageRevokeInterval
             self.maxMessageRevokeIntervalInPrivateChats = maxMessageRevokeIntervalInPrivateChats
@@ -52,6 +37,7 @@ public enum EngineConfiguration {
     
     public struct UserLimits: Equatable {
         public let maxPinnedChatCount: Int32
+        public let maxArchivedPinnedChatCount: Int32
         public let maxChannelsCount: Int32
         public let maxPublicLinksCount: Int32
         public let maxSavedGifCount: Int32
@@ -70,6 +56,7 @@ public enum EngineConfiguration {
 
         public init(
             maxPinnedChatCount: Int32,
+            maxArchivedPinnedChatCount: Int32,
             maxChannelsCount: Int32,
             maxPublicLinksCount: Int32,
             maxSavedGifCount: Int32,
@@ -83,6 +70,7 @@ public enum EngineConfiguration {
             maxReactionsPerMessage: Int32
         ) {
             self.maxPinnedChatCount = maxPinnedChatCount
+            self.maxArchivedPinnedChatCount = maxArchivedPinnedChatCount
             self.maxChannelsCount = maxChannelsCount
             self.maxPublicLinksCount = maxPublicLinksCount
             self.maxSavedGifCount = maxSavedGifCount
@@ -103,16 +91,11 @@ public typealias EngineContentSettings = ContentSettings
 public extension EngineConfiguration.Limits {
     init(_ limitsConfiguration: LimitsConfiguration) {
         self.init(
-            maxPinnedChatCount: limitsConfiguration.maxPinnedChatCount,
-            maxArchivedPinnedChatCount: limitsConfiguration.maxArchivedPinnedChatCount,
             maxGroupMemberCount: limitsConfiguration.maxGroupMemberCount,
             maxSupergroupMemberCount: limitsConfiguration.maxSupergroupMemberCount,
             maxMessageForwardBatchSize: limitsConfiguration.maxMessageForwardBatchSize,
-            maxSavedGifCount: limitsConfiguration.maxSavedGifCount,
-            maxFavedStickerCount: limitsConfiguration.maxFavedStickerCount,
             maxRecentStickerCount: limitsConfiguration.maxRecentStickerCount,
             maxMessageEditingInterval: limitsConfiguration.maxMessageEditingInterval,
-            maxMediaCaptionLength: limitsConfiguration.maxMediaCaptionLength,
             canRemoveIncomingMessagesInPrivateChats: limitsConfiguration.canRemoveIncomingMessagesInPrivateChats,
             maxMessageRevokeInterval: limitsConfiguration.maxMessageRevokeInterval,
             maxMessageRevokeIntervalInPrivateChats: limitsConfiguration.maxMessageRevokeIntervalInPrivateChats
@@ -121,16 +104,11 @@ public extension EngineConfiguration.Limits {
     
     func _asLimits() -> LimitsConfiguration {
         return LimitsConfiguration(
-            maxPinnedChatCount: self.maxPinnedChatCount,
-            maxArchivedPinnedChatCount: self.maxArchivedPinnedChatCount,
             maxGroupMemberCount: self.maxGroupMemberCount,
             maxSupergroupMemberCount: self.maxSupergroupMemberCount,
             maxMessageForwardBatchSize: self.maxMessageForwardBatchSize,
-            maxSavedGifCount: self.maxSavedGifCount,
             maxRecentStickerCount: self.maxRecentStickerCount,
-            maxFavedStickerCount: self.maxFavedStickerCount,
             maxMessageEditingInterval: self.maxMessageEditingInterval,
-            maxMediaCaptionLength: self.maxMediaCaptionLength,
             canRemoveIncomingMessagesInPrivateChats: self.canRemoveIncomingMessagesInPrivateChats,
             maxMessageRevokeInterval: self.maxMessageRevokeInterval,
             maxMessageRevokeIntervalInPrivateChats: self.maxMessageRevokeIntervalInPrivateChats
@@ -142,6 +120,7 @@ public extension EngineConfiguration.UserLimits {
     init(_ userLimitsConfiguration: UserLimitsConfiguration) {
         self.init(
             maxPinnedChatCount: userLimitsConfiguration.maxPinnedChatCount,
+            maxArchivedPinnedChatCount: userLimitsConfiguration.maxArchivedPinnedChatCount,
             maxChannelsCount: userLimitsConfiguration.maxChannelsCount,
             maxPublicLinksCount: userLimitsConfiguration.maxPublicLinksCount,
             maxSavedGifCount: userLimitsConfiguration.maxSavedGifCount,
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
index 9a903484eb..378b4fe35c 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
@@ -17,7 +17,6 @@ func _internal_toggleItemPinned(postbox: Postbox, accountPeerId: PeerId, locatio
         let isPremium = transaction.getPeer(accountPeerId)?.isPremium ?? false
         
         let appConfiguration = transaction.getPreferencesEntry(key: PreferencesKeys.appConfiguration)?.get(AppConfiguration.self) ?? .defaultValue
-        let limitsConfiguration = transaction.getPreferencesEntry(key: PreferencesKeys.limitsConfiguration)?.get(LimitsConfiguration.self) ?? LimitsConfiguration.defaultValue
         let userLimitsConfiguration = UserLimitsConfiguration(appConfiguration: appConfiguration, isPremium: isPremium)
         
         switch location {
@@ -46,7 +45,7 @@ func _internal_toggleItemPinned(postbox: Postbox, accountPeerId: PeerId, locatio
             if case .root = groupId {
                 limitCount = Int(userLimitsConfiguration.maxPinnedChatCount)
             } else {
-                limitCount = Int(limitsConfiguration.maxArchivedPinnedChatCount)
+                limitCount = Int(userLimitsConfiguration.maxArchivedPinnedChatCount)
             }
             
             let count = sameKind.count + additionalCount
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index 0f0cdb7606..5013d650be 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -7923,7 +7923,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 var webpageUrl: String?
                                 for media in message.media {
                                     if media is TelegramMediaImage || media is TelegramMediaFile {
-                                        inputTextMaxLength = strongSelf.context.currentLimitsConfiguration.with { $0 }.maxMediaCaptionLength
+                                        inputTextMaxLength = strongSelf.context.userLimits.maxCaptionLength
                                     } else if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content {
                                         webpageUrl = content.url
                                     }