diff --git a/NotificationService/NotificationService.swift b/NotificationService/NotificationService.swift
index 50aa12c013..da3dcb0962 100644
--- a/NotificationService/NotificationService.swift
+++ b/NotificationService/NotificationService.swift
@@ -335,12 +335,14 @@ class NotificationService: UNNotificationServiceExtension {
             var inputFileLocation: (Int32, Api.InputFileLocation)?
             var fetchResourceId: String?
             var isPng = false
+            var isExpandableMedia = false
             
             if let attachment = attachment {
                 switch attachment {
                     case let .photo(photo):
                         switch photo {
                             case let .photo(_, id, accessHash, fileReference, _, sizes, dcId):
+                                isExpandableMedia = true
                                 loop: for size in sizes {
                                     switch size {
                                         case let .photoSize(type, _, _, _, _):
@@ -368,6 +370,9 @@ class NotificationService: UNNotificationServiceExtension {
                                             break
                                     }
                                 }
+                                if isSticker {
+                                    isExpandableMedia = true
+                                }
                                 if let thumbs = thumbs {
                                     loop: for size in thumbs {
                                         switch size {
@@ -425,10 +430,12 @@ class NotificationService: UNNotificationServiceExtension {
                         
                         userInfo["media"] = attachmentData.base64EncodedString()
                         
-                        if category == "r" {
-                            self.bestAttemptContent?.categoryIdentifier = "withReplyMedia"
-                        } else if category == "m" {
-                            self.bestAttemptContent?.categoryIdentifier = "withMuteMedia"
+                        if isExpandableMedia {
+                            if category == "r" {
+                                self.bestAttemptContent?.categoryIdentifier = "withReplyMedia"
+                            } else if category == "m" {
+                                self.bestAttemptContent?.categoryIdentifier = "withMuteMedia"
+                            }
                         }
                     }
                 }
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index e33764a5da..4970426cc0 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -4233,3 +4233,7 @@ Unused sets are archived when you add more.";
 "ChatList.UnarchiveAction" = "Unarchive";
 "ChatList.HideAction" = "Hide";
 "ChatList.UnhideAction" = "Unhide";
+
+"ChatList.UndoArchiveTitle" = "Chat Archived";
+"ChatList.UndoArchiveText" = "Muted chats will stay archived after new messages arrive.";
+"ChatList.ArchivedChatsTitle" = "Archived Chats";
diff --git a/submodules/Postbox b/submodules/Postbox
index dcd5efe786..e18ec69dd6 160000
--- a/submodules/Postbox
+++ b/submodules/Postbox
@@ -1 +1 @@
-Subproject commit dcd5efe7860714c519dd7fe6268b24fcc05026cb
+Subproject commit e18ec69dd6e0edec8e4c4a8f2fde797295085168
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 1b3b5aad52..20b755baf3 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 1b3b5aad52e624d0280d93ecb17b7f058c45cd40
+Subproject commit 20b755baf35cd7db541f7cd489388dfd1b640d0c
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 30dceb365b..ef10041525 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 30dceb365be51424b7f29031a2a61ecfeac2b4f5
+Subproject commit ef10041525194b49058f86a6e360e2951e927c2f