diff --git a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
index fbcd00ba92..ae6f0a9275 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
@@ -469,7 +469,11 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
                         if case let .channel(channel) = iconPeer, channel.flags.contains(.isForum) {
                             clipStyle = .roundedRect
                         }
-                        avatarNode.setPeer(context: context, theme: item.presentationData.theme, peer: iconPeer, clipStyle: clipStyle)
+                        var overrideImage: AvatarNodeImageOverride?
+                        if iconPeer.id == context.account.peerId {
+                            overrideImage = .savedMessagesIcon
+                        }
+                        avatarNode.setPeer(context: context, theme: item.presentationData.theme, peer: iconPeer, overrideImage: overrideImage, clipStyle: clipStyle)
                     } else if let avatarNode = strongSelf.avatarNode {
                         strongSelf.avatarNode = nil
                         avatarNode.removeFromSupernode()
diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageExceptionsScreen.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageExceptionsScreen.swift
index 6cf80c2510..3d8ec5d6c1 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageExceptionsScreen.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageExceptionsScreen.swift	
@@ -166,7 +166,14 @@ private enum StorageUsageExceptionsEntry: ItemListNodeEntry {
                 optionText = timeIntervalString(strings: presentationData.strings, value: value)
             }
             
-            return ItemListDisclosureItem(presentationData: presentationData, icon: nil, context: arguments.context, iconPeer: EnginePeer(peer.peer), title: EnginePeer(peer.peer).displayTitle(strings: presentationData.strings, displayOrder: .firstLast), enabled: true, titleFont: .bold, label: optionText, labelStyle: .text, additionalDetailLabel: additionalDetailLabel, sectionId: self.section, style: .blocks, disclosureStyle: .optionArrows, action: {
+            let title: String
+            if peer.peer.id == arguments.context.account.peerId {
+                title = presentationData.strings.DialogList_SavedMessages
+            } else {
+                title = EnginePeer(peer.peer).displayTitle(strings: presentationData.strings, displayOrder: .firstLast)
+            }
+            
+            return ItemListDisclosureItem(presentationData: presentationData, icon: nil, context: arguments.context, iconPeer: EnginePeer(peer.peer), title: title, enabled: true, titleFont: .bold, label: optionText, labelStyle: .text, additionalDetailLabel: additionalDetailLabel, sectionId: self.section, style: .blocks, disclosureStyle: .optionArrows, action: {
                 arguments.openPeerMenu(peer.peer.id, value)
             }, tag: StorageUsageExceptionsEntryTag.peer(peer.peer.id))
         }