diff --git a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
index 29b542f66c..45395f1ccf 100644
--- a/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
+++ b/Telegram/SourceFiles/ayu/ui/ayu_logo.cpp
@@ -43,7 +43,7 @@ void loadIcons() {
 	}
 }
 
-QImage loadPreview(QString name) {
+QImage loadPreview(const QString& name) {
 	return QImage(qsl(":/gui/art/ayu/%1/app_preview.png").arg(name));
 }
 
diff --git a/Telegram/SourceFiles/ayu/ui/ayu_logo.h b/Telegram/SourceFiles/ayu/ui/ayu_logo.h
index 564beb8c05..736812d2bb 100644
--- a/Telegram/SourceFiles/ayu/ui/ayu_logo.h
+++ b/Telegram/SourceFiles/ayu/ui/ayu_logo.h
@@ -26,7 +26,7 @@ ICON(EXTERA2, "extera2");
 
 void loadAppIco();
 
-QImage loadPreview(QString name);
+QImage loadPreview(const QString& name);
 
 QString currentAppLogoName();
 QImage currentAppLogo();
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 99250b6046..063551f996 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -2182,6 +2182,12 @@ void HistoryItem::clearMediaAsExpired() {
 	if (!media || !media->ttlSeconds()) {
 		return;
 	}
+
+	const auto& settings = AyuSettings::getInstance();
+	if (settings.saveDeletedMessages) {
+		return;
+	}
+
 	if (const auto document = media->document()) {
 		applyEditionToHistoryCleared();
 		auto text = (document->isVideoFile()