diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index c5053c32c..f74da841d 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -2761,12 +2761,19 @@ namespace {
 	}
 
 	void complexOverlayRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
-		auto overlayCorners = (radius == ImageRoundRadius::Small) ? SelectedOverlaySmallCorners : SelectedOverlayLargeCorners;
-		auto overlayParts = RectPart::Full | RectPart::None;
-		if (radius == ImageRoundRadius::Large) {
-			complexAdjustRect(corners, rect, overlayParts);
+		if (radius == ImageRoundRadius::Ellipse) {
+			PainterHighQualityEnabler hq(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(p.textPalette().selectOverlay);
+			p.drawEllipse(rect);
+		} else {
+			auto overlayCorners = (radius == ImageRoundRadius::Small) ? SelectedOverlaySmallCorners : SelectedOverlayLargeCorners;
+			auto overlayParts = RectPart::Full | RectPart::None;
+			if (radius == ImageRoundRadius::Large) {
+				complexAdjustRect(corners, rect, overlayParts);
+			}
+			roundRect(p, rect, p.textPalette().selectOverlay, overlayCorners, nullptr, overlayParts);
 		}
-		roundRect(p, rect, p.textPalette().selectOverlay, overlayCorners, nullptr, overlayParts);
 	}
 
 	void complexLocationRect(Painter &p, QRect rect, ImageRoundRadius radius, ImageRoundCorners corners) {
diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index 35ab7f127..1e8d7352b 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -1044,7 +1044,7 @@ void HistoryDocument::initDimensions() {
 	} else {
 		tleft = st::msgFilePadding.left() + st::msgFileSize + st::msgFilePadding.right();
 		tright = st::msgFileThumbPadding.left();
-		int32 unread = _data->voice() ? (st::mediaUnreadSkip + st::mediaUnreadSize) : 0;
+		auto unread = _data->voice() ? (st::mediaUnreadSkip + st::mediaUnreadSize) : 0;
 		_maxw = qMax(_maxw, tleft + documentMaxStatusWidth(_data) + unread + _parent->skipBlockWidth() + st::msgPadding.right());
 	}
 
@@ -1768,9 +1768,10 @@ int HistoryGif::resizeGetHeight(int width) {
 	_width = qMax(_width, _parent->infoWidth() + 2 * int32(st::msgDateImgDelta + st::msgDateImgPadding.x()));
 	if (_gif && _gif->ready()) {
 		if (!_gif->started()) {
+			auto isRound = _data->isRoundVideo();
 			auto inWebPage = (_parent->getMedia() != this);
-			auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-			auto roundCorners = inWebPage ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
+			auto roundRadius = isRound ? ImageRoundRadius::Ellipse : inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
+			auto roundCorners = (isRound || inWebPage) ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
 				| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
 			_gif->start(_thumbw, _thumbh, _width, _height, roundRadius, roundCorners);
 		}
@@ -1807,9 +1808,10 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 	bool bubble = _parent->hasBubble();
 	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 
-	int32 captionw = width - st::msgPadding.left() - st::msgPadding.right();
+	auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
 
-	bool animating = (_gif && _gif->started());
+	auto isRound = _data->isRoundVideo();
+	auto animating = (_gif && _gif->started());
 
 	if (!animating || _parent->id < 0) {
 		if (displayLoading) {
@@ -1820,7 +1822,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		}
 		updateStatusText();
 	}
-	bool radial = isRadialAnimation(ms);
+	auto radial = isRadialAnimation(ms);
 
 	if (bubble) {
 		skipx = st::mediaPadding.left();
@@ -1834,15 +1836,15 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 				height -= st::msgPadding.bottom();
 			}
 		}
-	} else {
+	} else if (!isRound) {
 		App::roundShadow(p, 0, 0, width, _height, selected ? st::msgInShadowSelected : st::msgInShadow, selected ? InSelectedShadowCorners : InShadowCorners);
 	}
 
 	QRect rthumb(rtlrect(skipx, skipy, width, height, _width));
 
 	auto inWebPage = (_parent->getMedia() != this);
-	auto roundRadius = inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
-	auto roundCorners = inWebPage ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
+	auto roundRadius = isRound ? ImageRoundRadius::Ellipse : inWebPage ? ImageRoundRadius::Small : ImageRoundRadius::Large;
+	auto roundCorners = (isRound || inWebPage) ? ImageRoundCorner::All : ((isBubbleTop() ? (ImageRoundCorner::TopLeft | ImageRoundCorner::TopRight) : ImageRoundCorner::None)
 		| ((isBubbleBottom() && _caption.isEmpty()) ? (ImageRoundCorner::BottomLeft | ImageRoundCorner::BottomRight) : ImageRoundCorner::None));
 	if (animating) {
 		auto paused = App::wnd()->controller()->isGifPausedAtLeastFor(Window::GifPauseReason::Any);
@@ -1895,10 +1897,11 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			_animation->radial.draw(p, rinner, st::msgFileRadialLine, selected ? st::historyFileThumbRadialFgSelected : st::historyFileThumbRadialFg);
 		}
 
-		if (!animating || _parent->id < 0) {
-			int32 statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x(), statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
-			int32 statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
-			int32 statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
+		if (!isRound && (!animating || _parent->id < 0)) {
+			auto statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x();
+			auto statusY = skipy + st::msgDateImgDelta + st::msgDateImgPadding.y();
+			auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
+			auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
 			App::roundRect(p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgDateImgBgSelected : st::msgDateImgBg, selected ? DateSelectedCorners : DateCorners);
 			p.setFont(st::normalFont);
 			p.setPen(st::msgDateImgFg);
@@ -1906,12 +1909,36 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		}
 	}
 
+	if (isRound) {
+		auto mediaUnread = _parent->isMediaUnread();
+		auto statusW = st::normalFont->width(_statusText) + 2 * st::msgDateImgPadding.x();
+		auto statusH = st::normalFont->height + 2 * st::msgDateImgPadding.y();
+		auto statusX = skipx + st::msgDateImgDelta + st::msgDateImgPadding.x();
+		auto statusY = skipy + height - st::msgDateImgDelta - statusH;
+		if (_parent->isMediaUnread()) {
+			statusW += st::mediaUnreadSkip + st::mediaUnreadSize;
+		}
+		App::roundRect(p, rtlrect(statusX - st::msgDateImgPadding.x(), statusY - st::msgDateImgPadding.y(), statusW, statusH, _width), selected ? st::msgServiceBgSelected : st::msgServiceBg, selected ? StickerSelectedCorners : StickerCorners);
+		p.setFont(st::normalFont);
+		p.setPen(st::msgServiceFg);
+		p.drawTextLeft(statusX, statusY, _width, _statusText, statusW - 2 * st::msgDateImgPadding.x());
+		if (mediaUnread) {
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::msgServiceFg);
+
+			{
+				PainterHighQualityEnabler hq(p);
+				p.drawEllipse(rtlrect(statusX - st::msgDateImgPadding.x() + statusW - st::msgDateImgPadding.x() - st::mediaUnreadSize, statusY + st::mediaUnreadTop, st::mediaUnreadSize, st::mediaUnreadSize, _width));
+			}
+		}
+	}
 	if (!_caption.isEmpty()) {
 		p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 		_caption.draw(p, st::msgPadding.left(), skipy + height + st::mediaPadding.bottom() + st::mediaCaptionSkip, captionw, style::al_left, 0, -1, selection);
-	} else if (_parent->getMedia() == this && (_data->uploading() || App::hoveredItem() == _parent)) {
-		int32 fullRight = skipx + width, fullBottom = skipy + height;
-		_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, InfoDisplayOverImage);
+	} else if (_parent->getMedia() == this && (isRound || _data->uploading() || App::hoveredItem() == _parent)) {
+		auto fullRight = skipx + width;
+		auto fullBottom = skipy + height;
+		_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, isRound ? InfoDisplayOverBackground : InfoDisplayOverImage);
 	}
 }
 
@@ -1971,7 +1998,11 @@ TextWithEntities HistoryGif::selectedText(TextSelection selection) const {
 }
 
 void HistoryGif::setStatusSize(int32 newSize) const {
-	HistoryFileMedia::setStatusSize(newSize, _data->size, -2, 0);
+	if (_data->isRoundVideo()) {
+		_statusText = formatDurationText(_data->duration());
+	} else {
+		HistoryFileMedia::setStatusSize(newSize, _data->size, -2, 0);
+	}
 }
 
 void HistoryGif::updateStatusText() const {
diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp
index 2a32d943d..663b2ea6e 100644
--- a/Telegram/SourceFiles/ui/images.cpp
+++ b/Telegram/SourceFiles/ui/images.cpp
@@ -191,6 +191,9 @@ void prepareCircle(QImage &img) {
 void prepareRound(QImage &image, ImageRoundRadius radius, ImageRoundCorners corners) {
 	if (!static_cast<int>(corners)) {
 		return;
+	} else if (radius == ImageRoundRadius::Ellipse) {
+		t_assert(corners == ImageRoundCorners(ImageRoundCorner::All));
+		prepareCircle(image);
 	}
 	t_assert(!image.isNull());
 
@@ -468,6 +471,8 @@ const QPixmap &Image::pixRounded(int32 w, int32 h, ImageRoundRadius radius, Imag
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
 	} else if (radius == ImageRoundRadius::Small) {
 		options |= Images::Option::RoundedSmall | cornerOptions(corners);
+	} else if (radius == ImageRoundRadius::Ellipse) {
+		options |= Images::Option::Circled | cornerOptions(corners);
 	}
 	auto k = PixKey(w, h, options);
 	auto i = _sizesCache.constFind(k);
@@ -618,6 +623,8 @@ const QPixmap &Image::pixSingle(int32 w, int32 h, int32 outerw, int32 outerh, Im
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
 	} else if (radius == ImageRoundRadius::Small) {
 		options |= Images::Option::RoundedSmall | cornerOptions(corners);
+	} else if (radius == ImageRoundRadius::Ellipse) {
+		options |= Images::Option::Circled | cornerOptions(corners);
 	}
 
 	auto k = SinglePixKey(options);
@@ -657,6 +664,8 @@ const QPixmap &Image::pixBlurredSingle(int w, int h, int32 outerw, int32 outerh,
 		options |= Images::Option::RoundedLarge | cornerOptions(corners);
 	} else if (radius == ImageRoundRadius::Small) {
 		options |= Images::Option::RoundedSmall | cornerOptions(corners);
+	} else if (radius == ImageRoundRadius::Ellipse) {
+		options |= Images::Option::Circled | cornerOptions(corners);
 	}
 
 	auto k = SinglePixKey(options);
diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h
index 25deaf813..6df39345e 100644
--- a/Telegram/SourceFiles/ui/images.h
+++ b/Telegram/SourceFiles/ui/images.h
@@ -37,6 +37,7 @@ enum class ImageRoundRadius {
 	None,
 	Large,
 	Small,
+	Ellipse,
 };
 enum class ImageRoundCorner {
 	None        = 0x00,