diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 68a8816c1..512ee948e 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -17,7 +17,6 @@ enum {
 	LocalEncryptNoPwdIterCount = 4, // key derivation iteration count without pwd (not secure anyway)
 	LocalEncryptSaltSize = 32, // 256 bit
 
-	AnimationTimerDelta = 7,
 	RecentInlineBotsLimit = 10,
 
 	AutoSearchTimeout = 900, // 0.9 secs
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index fa6daffe8..d28ed4e1d 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -329,6 +329,9 @@ OverlayWidget::OverlayWidget()
 	_saveMsgImage = QImage(
 		_saveMsg.size() * cIntRetinaFactor(),
 		QImage::Format_ARGB32_Premultiplied);
+	_saveMsgTimer.setCallback([=, delay = st::mediaviewSaveMsgHiding] {
+		_saveMsgAnimation.start([=] { updateImage(); }, 1., 0., delay);
+	});
 
 	_docRectImage = QImage(
 		st::mediaviewFileSize * cIntRetinaFactor(),
@@ -457,8 +460,6 @@ OverlayWidget::OverlayWidget()
 		}
 	}, lifetime());
 
-	_saveMsgUpdater.setCallback([=] { updateImage(); });
-
 	_widget->setAttribute(Qt::WA_AcceptTouchEvents);
 	_touchTimer.setCallback([=] { handleTouchTimer(); });
 
@@ -1795,8 +1796,17 @@ void OverlayWidget::downloadMedia() {
 	}
 	if (!toName.isEmpty()) {
 		_saveMsgFilename = toName;
-		_saveMsgStarted = crl::now();
-		_saveMsgOpacity.start(1);
+		const auto toIn = 1.;
+		_saveMsgAnimation.start(
+			[=](float64 value) {
+				updateImage();
+				if (value == toIn) {
+					_saveMsgTimer.callOnce(st::mediaviewSaveMsgShown);
+				}
+			},
+			0.,
+			toIn,
+			st::mediaviewSaveMsgShowing);
 		updateImage();
 	}
 }
@@ -2329,7 +2339,8 @@ void OverlayWidget::initGroupThumbs() {
 }
 
 void OverlayWidget::clearControlsState() {
-	_saveMsgStarted = 0;
+	_saveMsgAnimation.stop();
+	_saveMsgTimer.cancel();
 	_loadRequest = 0;
 	_over = _down = OverNone;
 	_pressed = false;
@@ -3442,8 +3453,7 @@ void OverlayWidget::paint(not_null<Renderer*> renderer) {
 			renderer->paintDocumentBubble(_docRect, _docIconRect);
 		}
 	}
-	updateSaveMsgState();
-	if (_saveMsgStarted && _saveMsgOpacity.current() > 0.) {
+	if (isSaveMsgShown()) {
 		renderer->paintSaveMsg(_saveMsg);
 	}
 
@@ -3686,7 +3696,7 @@ void OverlayWidget::paintSaveMsgContent(
 		Painter &p,
 		QRect outer,
 		QRect clip) {
-	p.setOpacity(_saveMsgOpacity.current());
+	p.setOpacity(_saveMsgAnimation.value(1.));
 	Ui::FillRoundRect(p, outer, st::mediaviewSaveMsgBg, Ui::MediaviewSaveCorners);
 	st::mediaviewSaveMsgCheck.paint(p, outer.topLeft() + st::mediaviewSaveMsgCheckPos, width());
 
@@ -3856,29 +3866,8 @@ void OverlayWidget::paintGroupThumbsContent(
 	}
 }
 
-void OverlayWidget::updateSaveMsgState() {
-	if (!_saveMsgStarted) {
-		return;
-	}
-	float64 dt = float64(crl::now()) - _saveMsgStarted;
-	float64 hidingDt = dt - st::mediaviewSaveMsgShowing - st::mediaviewSaveMsgShown;
-	if (dt >= st::mediaviewSaveMsgShowing
-		+ st::mediaviewSaveMsgShown
-		+ st::mediaviewSaveMsgHiding) {
-		_saveMsgStarted = 0;
-		return;
-	}
-	if (hidingDt >= 0 && _saveMsgOpacity.to() > 0.5) {
-		_saveMsgOpacity.start(0);
-	}
-	float64 progress = (hidingDt >= 0) ? (hidingDt / st::mediaviewSaveMsgHiding) : (dt / st::mediaviewSaveMsgShowing);
-	_saveMsgOpacity.update(qMin(progress, 1.), anim::linear);
-	if (!_blurred) {
-		const auto nextFrame = (dt < st::mediaviewSaveMsgShowing || hidingDt >= 0)
-			? int(AnimationTimerDelta)
-			: (st::mediaviewSaveMsgShowing + st::mediaviewSaveMsgShown + 1 - dt);
-		_saveMsgUpdater.callOnce(nextFrame);
-	}
+bool OverlayWidget::isSaveMsgShown() const {
+	return _saveMsgAnimation.animating() || _saveMsgTimer.isActive();
 }
 
 void OverlayWidget::handleKeyPress(not_null<QKeyEvent*> e) {
@@ -4267,7 +4256,7 @@ void OverlayWidget::handleMousePress(
 				|| _over == OverClose
 				|| _over == OverVideo) {
 				_down = _over;
-			} else if (!_saveMsg.contains(position) || !_saveMsgStarted) {
+			} else if (!_saveMsg.contains(position) || !isSaveMsgShown()) {
 				_pressed = true;
 				_dragging = 0;
 				updateCursor();
@@ -4397,7 +4386,7 @@ bool OverlayWidget::updateOverState(OverState newState) {
 void OverlayWidget::updateOver(QPoint pos) {
 	ClickHandlerPtr lnk;
 	ClickHandlerHost *lnkhost = nullptr;
-	if (_saveMsgStarted && _saveMsg.contains(pos)) {
+	if (isSaveMsgShown() && _saveMsg.contains(pos)) {
 		auto textState = _saveMsgText.getState(pos - _saveMsg.topLeft() - QPoint(st::mediaviewSaveMsgPadding.left(), st::mediaviewSaveMsgPadding.top()), _saveMsg.width() - st::mediaviewSaveMsgPadding.left() - st::mediaviewSaveMsgPadding.right());
 		lnk = textState.link;
 		lnkhost = this;
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 7ec846c30..b4fe87b59 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -389,7 +389,7 @@ private:
 		QRect clip,
 		float64 opacity);
 
-	void updateSaveMsgState();
+	[[nodiscard]] bool isSaveMsgShown() const;
 
 	void updateOverRect(OverState state);
 	bool updateOverState(OverState newState);
@@ -569,13 +569,13 @@ private:
 	QPoint _touchStart;
 
 	QString _saveMsgFilename;
-	crl::time _saveMsgStarted = 0;
-	anim::value _saveMsgOpacity;
 	QRect _saveMsg;
 	QImage _saveMsgImage;
-	base::Timer _saveMsgUpdater;
 	Ui::Text::String _saveMsgText;
 	SavePhotoVideo _savePhotoVideoWhenLoaded = SavePhotoVideo::None;
+	// _saveMsgAnimation -> _saveMsgTimer -> _saveMsgAnimation.
+	Ui::Animations::Simple _saveMsgAnimation;
+	base::Timer _saveMsgTimer;
 
 	base::flat_map<OverState, crl::time> _animations;
 	base::flat_map<OverState, anim::value> _animationOpacities;