diff --git a/TelegramCore/Account.swift b/TelegramCore/Account.swift
index 8467f32327..9a63767098 100644
--- a/TelegramCore/Account.swift
+++ b/TelegramCore/Account.swift
@@ -1052,14 +1052,14 @@ public class Account {
             
             return masterNotificationsKey(account: self, ignoreDisabled: false)
             |> mapToSignal { secret -> Signal<Void, NoError> in
-                return network.request(Api.functions.account.registerDevice(tokenType: 1, token: tokenString, appSandbox: appSandbox, secret: Buffer(data: secret.data), otherUids: []))
+                return network.request(Api.functions.account.registerDevice(tokenType: 1, token: tokenString, appSandbox: appSandbox, secret: Buffer(/*data: secret.data*/), otherUids: []))
                 |> retryRequest
                 |> mapToSignal { _ -> Signal<Void, NoError> in
                     return .complete()
                 }
             }
         }
-        //self.notificationTokenDisposable.set(appliedNotificationToken.start())
+        self.notificationTokenDisposable.set(appliedNotificationToken.start())
         
         let appliedVoipToken = combineLatest(self.voipToken.get(), self.notificationTokensVersionPromise.get())
         |> distinctUntilChanged(isEqual: { $0 == $1 })
diff --git a/TelegramCore/LimitsConfiguration.swift b/TelegramCore/LimitsConfiguration.swift
index b262543a1c..121cf7b03b 100644
--- a/TelegramCore/LimitsConfiguration.swift
+++ b/TelegramCore/LimitsConfiguration.swift
@@ -12,18 +12,20 @@ public final class LimitsConfiguration: PreferencesEntry {
     public let maxSavedGifCount: Int32
     public let maxRecentStickerCount: Int32
     public let maxMessageEditingInterval: Int32
+    public let maxMediaCaptionLength: Int32
     
     public static var defaultValue: LimitsConfiguration {
-        return LimitsConfiguration(maxGroupMemberCount: 200, maxSupergroupMemberCount: 5000, maxMessageForwardBatchSize: 50, maxSavedGifCount: 200, maxRecentStickerCount: 20, maxMessageEditingInterval: 2 * 24 * 60 * 60)
+        return LimitsConfiguration(maxGroupMemberCount: 200, maxSupergroupMemberCount: 5000, maxMessageForwardBatchSize: 50, maxSavedGifCount: 200, maxRecentStickerCount: 20, maxMessageEditingInterval: 2 * 24 * 60 * 60, maxMediaCaptionLength: 1000)
     }
     
-    init(maxGroupMemberCount: Int32, maxSupergroupMemberCount: Int32, maxMessageForwardBatchSize: Int32, maxSavedGifCount: Int32, maxRecentStickerCount: Int32, maxMessageEditingInterval: Int32) {
+    init(maxGroupMemberCount: Int32, maxSupergroupMemberCount: Int32, maxMessageForwardBatchSize: Int32, maxSavedGifCount: Int32, maxRecentStickerCount: Int32, maxMessageEditingInterval: Int32, maxMediaCaptionLength: Int32) {
         self.maxGroupMemberCount = maxGroupMemberCount
         self.maxSupergroupMemberCount = maxSupergroupMemberCount
         self.maxMessageForwardBatchSize = maxMessageForwardBatchSize
         self.maxSavedGifCount = maxSavedGifCount
         self.maxRecentStickerCount = maxRecentStickerCount
         self.maxMessageEditingInterval = maxMessageEditingInterval
+        self.maxMediaCaptionLength = maxMediaCaptionLength
     }
     
     public init(decoder: PostboxDecoder) {
@@ -33,6 +35,7 @@ public final class LimitsConfiguration: PreferencesEntry {
         self.maxSavedGifCount = decoder.decodeInt32ForKey("maxSavedGifCount", orElse: 200)
         self.maxRecentStickerCount = decoder.decodeInt32ForKey("maxRecentStickerCount", orElse: 20)
         self.maxMessageEditingInterval = decoder.decodeInt32ForKey("maxMessageEditingInterval", orElse: 2 * 24 * 60 * 60)
+        self.maxMediaCaptionLength = decoder.decodeInt32ForKey("maxMediaCaptionLength", orElse: 1000)
     }
     
     public func encode(_ encoder: PostboxEncoder) {
@@ -42,6 +45,7 @@ public final class LimitsConfiguration: PreferencesEntry {
         encoder.encodeInt32(self.maxSavedGifCount, forKey: "maxSavedGifCount")
         encoder.encodeInt32(self.maxRecentStickerCount, forKey: "maxRecentStickerCount")
         encoder.encodeInt32(self.maxMessageEditingInterval, forKey: "maxMessageEditingInterval")
+        encoder.encodeInt32(self.maxMediaCaptionLength, forKey: "maxMediaCaptionLength")
     }
     
     public func isEqual(to: PreferencesEntry) -> Bool {
@@ -66,6 +70,9 @@ public final class LimitsConfiguration: PreferencesEntry {
         if self.maxMessageEditingInterval != to.maxMessageEditingInterval {
             return false
         }
+        if self.maxMediaCaptionLength != to.maxMediaCaptionLength {
+            return false
+        }
         return true
     }
 }
diff --git a/TelegramCore/ManagedConfigurationUpdates.swift b/TelegramCore/ManagedConfigurationUpdates.swift
index ec2572976d..d321aca575 100644
--- a/TelegramCore/ManagedConfigurationUpdates.swift
+++ b/TelegramCore/ManagedConfigurationUpdates.swift
@@ -60,7 +60,7 @@ func managedConfigurationUpdates(postbox: Postbox, network: Network) -> Signal<V
                             return entry
                         })
                         
-                        updateLimitsConfiguration(transaction: transaction, configuration: LimitsConfiguration(maxGroupMemberCount: config.chatSizeMax, maxSupergroupMemberCount: config.megagroupSizeMax, maxMessageForwardBatchSize: config.forwardedCountMax, maxSavedGifCount: config.savedGifsLimit, maxRecentStickerCount: config.stickersRecentLimit, maxMessageEditingInterval: config.editTimeLimit))
+                        updateLimitsConfiguration(transaction: transaction, configuration: LimitsConfiguration(maxGroupMemberCount: config.chatSizeMax, maxSupergroupMemberCount: config.megagroupSizeMax, maxMessageForwardBatchSize: config.forwardedCountMax, maxSavedGifCount: config.savedGifsLimit, maxRecentStickerCount: config.stickersRecentLimit, maxMessageEditingInterval: config.editTimeLimit, maxMediaCaptionLength: config.captionLengthMax))
                         updateVoipConfiguration(transaction: transaction, { configuration in
                             var configuration = configuration
                             let contacts = config.flags & (1 << 3) != 0