Implement correct saved messages history layout.

Forwarded info is displayed as a message author info (name/photo).
Outgoing messages without forwarded info are displayed as out().
Messages with save_from_ info have a button for GoToOriginal().

Telegram/SourceFiles/history/history.cpp

@@ -110,7 +110,7 @@ void History::clearLastKeyboard() {
 }
 
 bool History::canHaveFromPhotos() const {
-	if (peer->isUser() && !Adaptive::ChatWide()) {
+	if (peer->isUser() && !peer->isSelf() && !Adaptive::ChatWide()) {
 		return false;
 	} else if (isChannel() && !peer->isMegagroup()) {
 		return false;

Telegram/SourceFiles/history/history.style

@@ -458,5 +458,6 @@ historyFastShareSize: 31px;
 historyFastShareLeft: 13px;
 historyFastShareBottom: 5px;
 historyFastShareIcon: icon {{ "fast_share", msgServiceFg, point(4px, 3px)}};
+historyGoToOriginalIcon: icon {{ "title_back-flip_horizontal", msgServiceFg, point(8px, 7px) }};
 
 historySavedFont: font(semibold 15px);

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -527,7 +527,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 
 				// paint the userpic if it intersects the painted rect
 				if (userpicTop + st::msgPhotoSize > clip.top()) {
-					message->from()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->history()->width, st::msgPhotoSize);
+					message->displayFrom()->paintUserpicLeft(p, st::historyPhotoLeft, userpicTop, message->history()->width, st::msgPhotoSize);
 				}
 				return true;
 			});
@@ -2140,7 +2140,7 @@ void HistoryInner::onUpdateSelected() {
 
 							// stop enumeration if we've found a userpic under the cursor
 							if (point.y() >= userpicTop && point.y() < userpicTop + st::msgPhotoSize) {
-								dragState.link = message->from()->openLink();
+								dragState.link = message->displayFrom()->openLink();
 								lnkhost = message;
 								return false;
 							}

Telegram/SourceFiles/history/history_item.cpp

@@ -616,8 +616,7 @@ HistoryItem::HistoryItem(
 , date(date)
 , _history(history)
 , _from(from ? App::user(from) : history->peer)
-, _flags(flags | MTPDmessage_ClientFlag::f_pending_init_dimensions | MTPDmessage_ClientFlag::f_pending_resize)
+, _flags(flags | MTPDmessage_ClientFlag::f_pending_init_dimensions | MTPDmessage_ClientFlag::f_pending_resize) {
-, _authorNameVersion(author()->nameVersion) {
 }
 
 void HistoryItem::finishCreate() {
@@ -789,11 +788,18 @@ void HistoryItem::nextItemChanged() {
 
 bool HistoryItem::computeIsAttachToPrevious(not_null<HistoryItem*> previous) {
 	if (!Has<HistoryMessageDate>() && !Has<HistoryMessageUnreadBar>()) {
-		return !isPost() && !previous->isPost()
+		const auto possible = !isPost() && !previous->isPost()
 			&& !serviceMsg() && !previous->serviceMsg()
 			&& !isEmpty() && !previous->isEmpty()
-			&& previous->from() == from()
 			&& (qAbs(previous->date.secsTo(date)) < kAttachMessageToPreviousSecondsDelta);
+		if (possible) {
+			if (history()->peer->isSelf()) {
+				return previous->senderOriginal() == senderOriginal()
+					&& (previous->Has<HistoryMessageForwarded>() == Has<HistoryMessageForwarded>());
+			} else {
+				return previous->from() == from();
+			}
+		}
 	}
 	return false;
 }
@@ -1022,6 +1028,13 @@ QString HistoryItem::directLink() const {
 	return QString();
 }
 
+bool HistoryItem::hasOutLayout() const {
+	if (history()->peer->isSelf()) {
+		return !Has<HistoryMessageForwarded>();
+	}
+	return out() && !isPost();
+}
+
 bool HistoryItem::unread() const {
 	// Messages from myself are always read.
 	if (history()->peer->isSelf()) return false;

Telegram/SourceFiles/history/history_item.h

@@ -155,6 +155,9 @@ struct HistoryMessageForwarded : public RuntimeComponent<HistoryMessageForwarded
 	QString _originalAuthor;
 	MsgId _originalId = 0;
 	mutable Text _text = { 1 };
+
+	PeerData *_savedFromPeer = nullptr;
+	MsgId _savedFromMsgId = 0;
 };
 
 struct HistoryMessageReply : public RuntimeComponent<HistoryMessageReply> {
@@ -645,9 +648,7 @@ public:
 	bool isSilent() const {
 		return _flags & MTPDmessage::Flag::f_silent;
 	}
-	bool hasOutLayout() const {
+	bool hasOutLayout() const;
-		return out() && !isPost();
-	}
 	virtual int32 viewsCount() const {
 		return hasViews() ? 1 : -1;
 	}
@@ -727,13 +728,13 @@ public:
 
 	virtual void drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const {
 	}
-	virtual ClickHandlerPtr fastShareLink() const {
+	virtual ClickHandlerPtr rightActionLink() const {
 		return ClickHandlerPtr();
 	}
-	virtual bool displayFastShare() const {
+	virtual bool displayRightAction() const {
 		return false;
 	}
-	virtual void drawFastShare(Painter &p, int left, int top, int outerWidth) const {
+	virtual void drawRightAction(Painter &p, int left, int top, int outerWidth) const {
 	}
 	virtual void setViewsCount(int32 count) {
 	}
@@ -985,8 +986,6 @@ protected:
 	int _indexInBlock = -1;
 	MTPDmessage::Flags _flags = 0;
 
-	mutable int32 _authorNameVersion = 0;
-
 	HistoryItem *previousItem() const {
 		if (_block && _indexInBlock >= 0) {
 			if (_indexInBlock > 0) {

Telegram/SourceFiles/history/history_media_types.cpp

@@ -366,7 +366,6 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 	bool notChild = (_parent->getMedia() == this);
 	int skipx = 0, skipy = 0, width = _width, height = _height;
 	bool bubble = _parent->hasBubble();
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 
 	int captionw = width - st::msgPadding.left() - st::msgPadding.right();
 
@@ -462,6 +461,7 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 
 	// date
 	if (!_caption.isEmpty()) {
+		auto outbg = _parent->hasOutLayout();
 		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 (notChild) {
@@ -470,10 +470,10 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 		if (_data->uploading() || App::hoveredItem() == _parent) {
 			_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, InfoDisplayOverImage);
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * skipx + width);
+			_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * skipx + width);
 		}
 	}
 }
@@ -523,11 +523,11 @@ HistoryTextState HistoryPhoto::getState(QPoint point, HistoryStateRequest reques
 		if (_parent->pointInTime(fullRight, fullBottom, point, InfoDisplayOverImage)) {
 			result.cursor = HistoryInDateCursorState;
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = _parent->fastShareLink();
+				result.link = _parent->rightActionLink();
 			}
 		}
 	}
@@ -779,7 +779,6 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 
 	int skipx = 0, skipy = 0, width = _width, height = _height;
 	bool bubble = _parent->hasBubble();
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 
 	int captionw = width - st::msgPadding.left() - st::msgPadding.right();
 
@@ -868,15 +867,16 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, Tim
 
 	// date
 	if (!_caption.isEmpty()) {
+		auto outbg = _parent->hasOutLayout();
 		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) {
 		auto fullRight = skipx + width, fullBottom = skipy + height;
 		_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, InfoDisplayOverImage);
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * skipx + width);
+			_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * skipx + width);
 		}
 	}
 }
@@ -921,11 +921,11 @@ HistoryTextState HistoryVideo::getState(QPoint point, HistoryStateRequest reques
 		if (_parent->pointInTime(fullRight, fullBottom, point, InfoDisplayOverImage)) {
 			result.cursor = HistoryInDateCursorState;
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = _parent->fastShareLink();
+				result.link = _parent->rightActionLink();
 			}
 		}
 	}
@@ -1224,8 +1224,7 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 	bool selected = (selection == FullSelection);
 
 	int captionw = _width - st::msgPadding.left() - st::msgPadding.right();
-
+	auto outbg = _parent->hasOutLayout();
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 
 	if (displayLoading) {
 		ensureAnimation();
@@ -1468,7 +1467,6 @@ HistoryTextState HistoryDocument::getState(QPoint point, HistoryStateRequest req
 
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return result;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 	bool loaded = _data->loaded();
 
 	bool showPause = updateStatusText();
@@ -2010,7 +2008,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 
 	int32 skipx = 0, skipy = 0, width = _width, height = _height;
 	bool bubble = _parent->hasBubble();
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	auto isChildMedia = (_parent->getMedia() != this);
 
 	auto captionw = width - st::msgPadding.left() - st::msgPadding.right();
@@ -2055,8 +2053,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 	auto forwarded = separateRoundVideo ? _parent->Get<HistoryMessageForwarded>() : nullptr;
 	if (via || reply || forwarded) {
 		usew = _maxw - additionalWidth(via, reply, forwarded);
-		if (isPost) {
+		if (outbg) {
-		} else if (out) {
 			usex = _width - usew;
 		}
 	}
@@ -2207,7 +2204,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 			if (reply) {
 				recth += st::msgReplyBarSize.height();
 			}
-			int rectx = isPost ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left()));
+			int rectx = outbg ? 0 : (usew + st::msgReplyPadding.left());
 			int recty = skipy;
 			if (rtl()) rectx = _width - rectx - rectw;
 
@@ -2260,14 +2257,14 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, TimeM
 		if (isRound || _data->uploading() || App::hoveredItem() == _parent) {
 			_parent->drawInfo(p, fullRight, fullBottom, 2 * skipx + width, selected, isRound ? InfoDisplayOverBackground : InfoDisplayOverImage);
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (fastShareLeft + st::historyFastShareSize > maxRight) {
 				fastShareLeft = (fullRight - st::historyFastShareSize - st::msgDateImgDelta);
 				fastShareTop -= (st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height + st::msgDateImgPadding.y());
 			}
-			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * skipx + width);
+			_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * skipx + width);
 		}
 	}
 }
@@ -2297,7 +2294,7 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 		width -= st::mediaPadding.left() + st::mediaPadding.right();
 		height -= skipy + st::mediaPadding.bottom();
 	}
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	auto isChildMedia = (_parent->getMedia() != this);
 	auto isRound = _data->isRoundVideo();
 	auto usew = width, usex = 0;
@@ -2307,8 +2304,7 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 	auto forwarded = separateRoundVideo ? _parent->Get<HistoryMessageForwarded>() : nullptr;
 	if (via || reply || forwarded) {
 		usew = _maxw - additionalWidth(via, reply, forwarded);
-		if (isPost) {
+		if (outbg) {
-		} else if (out) {
 			usex = _width - usew;
 		}
 	}
@@ -2328,7 +2324,7 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 		if (reply) {
 			recth += st::msgReplyBarSize.height();
 		}
-		auto rectx = isPost ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left()));
+		auto rectx = outbg ? 0 : (usew + st::msgReplyPadding.left());
 		auto recty = skipy;
 		if (rtl()) rectx = _width - rectx - rectw;
 
@@ -2401,7 +2397,7 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 				result.cursor = HistoryInDateCursorState;
 			}
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (fastShareLeft + st::historyFastShareSize > maxRight) {
@@ -2409,7 +2405,7 @@ HistoryTextState HistoryGif::getState(QPoint point, HistoryStateRequest request)
 				fastShareTop -= st::msgDateImgDelta + st::msgDateImgPadding.y() + st::msgDateFont->height + st::msgDateImgPadding.y();
 			}
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = _parent->fastShareLink();
+				result.link = _parent->rightActionLink();
 			}
 		}
 	}
@@ -2739,15 +2735,15 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 	bool loaded = _data->loaded();
 	bool selected = (selection == FullSelection);
 
-	bool out = _parent->out(), isPost = _parent->isPost(), childmedia = (_parent->getMedia() != this);
+	auto outbg = _parent->hasOutLayout();
+	auto childmedia = (_parent->getMedia() != this);
 
 	int usew = _maxw, usex = 0;
 	auto via = childmedia ? nullptr : _parent->Get<HistoryMessageVia>();
 	auto reply = childmedia ? nullptr : _parent->Get<HistoryMessageReply>();
 	if (via || reply) {
 		usew -= additionalWidth(via, reply);
-		if (isPost) {
+		if (outbg) {
-		} else if (out) {
 			usex = _width - usew;
 		}
 	}
@@ -2780,7 +2776,7 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 			if (reply) {
 				recth += st::msgReplyBarSize.height();
 			}
-			int rectx = isPost ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left()));
+			int rectx = outbg ? 0 : (usew + st::msgReplyPadding.left());
 			int recty = st::msgDateImgDelta;
 			if (rtl()) rectx = _width - rectx - rectw;
 
@@ -2802,10 +2798,10 @@ void HistorySticker::draw(Painter &p, const QRect &r, TextSelection selection, T
 				reply->paint(p, _parent, rectx, recty, rectw, flags);
 			}
 		}
-		if (_parent->displayFastShare()) {
+		if (_parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * usex + usew);
+			_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * usex + usew);
 		}
 	}
 }
@@ -2814,15 +2810,15 @@ HistoryTextState HistorySticker::getState(QPoint point, HistoryStateRequest requ
 	HistoryTextState result;
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return result;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), childmedia = (_parent->getMedia() != this);
+	auto outbg = _parent->hasOutLayout();
+	auto childmedia = (_parent->getMedia() != this);
 
 	int usew = _maxw, usex = 0;
 	auto via = childmedia ? nullptr : _parent->Get<HistoryMessageVia>();
 	auto reply = childmedia ? nullptr : _parent->Get<HistoryMessageReply>();
 	if (via || reply) {
 		usew -= additionalWidth(via, reply);
-		if (isPost) {
+		if (outbg) {
-		} else if (out) {
 			usex = _width - usew;
 		}
 	}
@@ -2837,7 +2833,7 @@ HistoryTextState HistorySticker::getState(QPoint point, HistoryStateRequest requ
 		if (reply) {
 			recth += st::msgReplyBarSize.height();
 		}
-		int rectx = isPost ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left()));
+		int rectx = outbg ? 0 : (usew + st::msgReplyPadding.left());
 		int recty = st::msgDateImgDelta;
 		if (rtl()) rectx = _width - rectx - rectw;
 
@@ -2864,11 +2860,11 @@ HistoryTextState HistorySticker::getState(QPoint point, HistoryStateRequest requ
 		if (_parent->pointInTime(fullRight, fullBottom, point, InfoDisplayOverImage)) {
 			result.cursor = HistoryInDateCursorState;
 		}
-		if (_parent->displayFastShare()) {
+		if (_parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = _parent->fastShareLink();
+				result.link = _parent->rightActionLink();
 			}
 		}
 	}
@@ -3027,7 +3023,7 @@ void HistoryContact::draw(Painter &p, const QRect &r, TextSelection selection, T
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	int32 skipx = 0, skipy = 0, width = _width, height = _height;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	bool selected = (selection == FullSelection);
 
 	if (width >= _maxw) {
@@ -3082,7 +3078,6 @@ void HistoryContact::draw(Painter &p, const QRect &r, TextSelection selection, T
 
 HistoryTextState HistoryContact::getState(QPoint point, HistoryStateRequest request) const {
 	HistoryTextState result;
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
 
 	int32 nameleft = 0, nametop = 0, nameright = 0, statustop = 0, linktop = 0;
 	auto topMinus = isBubbleTop() ? 0 : st::msgFileTopMinus;
@@ -3193,7 +3188,7 @@ void HistoryCall::draw(Painter &p, const QRect &r, TextSelection selection, Time
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	auto skipx = 0, skipy = 0, width = _width, height = _height;
 
-	auto out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	auto selected = (selection == FullSelection);
 
 	if (width >= _maxw) {
@@ -3549,7 +3544,7 @@ void HistoryWebPage::draw(Painter &p, const QRect &r, TextSelection selection, T
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	int32 skipx = 0, skipy = 0, width = _width, height = _height;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	bool selected = (selection == FullSelection);
 
 	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
@@ -3994,7 +3989,7 @@ void HistoryGame::draw(Painter &p, const QRect &r, TextSelection selection, Time
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	int32 width = _width, height = _height;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	bool selected = (selection == FullSelection);
 
 	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
@@ -4431,7 +4426,7 @@ void HistoryInvoice::draw(Painter &p, const QRect &r, TextSelection selection, T
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	int32 width = _width, height = _height;
 
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	bool selected = (selection == FullSelection);
 
 	auto &barfg = selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor);
@@ -4718,7 +4713,7 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection,
 	if (_width < st::msgPadding.left() + st::msgPadding.right() + 1) return;
 	int32 skipx = 0, skipy = 0, width = _width, height = _height;
 	bool bubble = _parent->hasBubble();
-	bool out = _parent->out(), isPost = _parent->isPost(), outbg = out && !isPost;
+	auto outbg = _parent->hasOutLayout();
 	bool selected = (selection == FullSelection);
 
 	if (bubble) {
@@ -4781,10 +4776,10 @@ void HistoryLocation::draw(Painter &p, const QRect &r, TextSelection selection,
 		auto fullRight = skipx + width;
 		auto fullBottom = _height - (skipx ? st::mediaPadding.bottom() : 0);
 		_parent->drawInfo(p, fullRight, fullBottom, skipx * 2 + width, selected, InfoDisplayOverImage);
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
-			_parent->drawFastShare(p, fastShareLeft, fastShareTop, 2 * skipx + width);
+			_parent->drawRightAction(p, fastShareLeft, fastShareTop, 2 * skipx + width);
 		}
 	}
 }
@@ -4843,11 +4838,11 @@ HistoryTextState HistoryLocation::getState(QPoint point, HistoryStateRequest req
 		if (_parent->pointInTime(fullRight, fullBottom, point, InfoDisplayOverImage)) {
 			result.cursor = HistoryInDateCursorState;
 		}
-		if (!bubble && _parent->displayFastShare()) {
+		if (!bubble && _parent->displayRightAction()) {
 			auto fastShareLeft = (fullRight + st::historyFastShareLeft);
 			auto fastShareTop = (fullBottom - st::historyFastShareBottom - st::historyFastShareSize);
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = _parent->fastShareLink();
+				result.link = _parent->rightActionLink();
 			}
 		}
 	}

Telegram/SourceFiles/history/history_message.cpp

@@ -38,6 +38,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_history.h"
 #include "styles/style_window.h"
 #include "window/notifications_manager.h"
+#include "window/window_controller.h"
 #include "observer_peer.h"
 #include "storage/storage_shared_media.h"
 
@@ -636,9 +637,15 @@ HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessage &ms
 		auto &f = msg.vfwd_from.c_messageFwdHeader();
 		config.originalDate = ::date(f.vdate);
 		if (f.has_from_id() || f.has_channel_id()) {
-			config.senderOriginal = f.has_channel_id() ? peerFromChannel(f.vchannel_id) : peerFromUser(f.vfrom_id);
+			config.senderOriginal = f.has_channel_id()
+				? peerFromChannel(f.vchannel_id)
+				: peerFromUser(f.vfrom_id);
 			if (f.has_channel_post()) config.originalId = f.vchannel_post.v;
 			if (f.has_post_author()) config.authorOriginal = qs(f.vpost_author);
+			if (f.has_saved_from_peer() && f.has_saved_from_msg_id()) {
+				config.savedFromPeer = peerFromMTP(f.vsaved_from_peer);
+				config.savedFromMsgId = f.vsaved_from_msg_id.v;
+			}
 		}
 	}
 	if (msg.has_reply_to_msg_id()) config.replyTo = msg.vreply_to_msg_id.v;
@@ -676,7 +683,14 @@ HistoryMessage::HistoryMessage(not_null<History*> history, const MTPDmessageServ
 	setText(TextWithEntities {});
 }
 
-HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage::Flags flags, QDateTime date, UserId from, const QString &postAuthor, not_null<HistoryMessage*> fwd)
+HistoryMessage::HistoryMessage(
+	not_null<History*> history,
+	MsgId id,
+	MTPDmessage::Flags flags,
+	QDateTime date,
+	UserId from,
+	const QString &postAuthor,
+	not_null<HistoryMessage*> fwd)
 : HistoryItem(history, id, NewForwardedFlags(history->peer, from, fwd) | flags, date, from) {
 	CreateConfig config;
 
@@ -690,6 +704,19 @@ HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage
 			config.originalId = fwd->idOriginal();
 		}
 	}
+	if (history->peer->isSelf()) {
+		//
+		// iOS app sends you to the original post if we forward a forward from channel.
+		// But server returns not the original post but the forward in saved_from_...
+		//
+		//if (config.originalId) {
+		//	config.savedFromPeer = config.senderOriginal;
+		//	config.savedFromMsgId = config.originalId;
+		//} else {
+			config.savedFromPeer = fwd->history()->peer->id;
+			config.savedFromMsgId = fwd->id;
+		//}
+	}
 	if (flags & MTPDmessage::Flag::f_post_author) {
 		config.author = postAuthor;
 	}
@@ -728,14 +755,14 @@ HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage
 }
 
 HistoryMessage::HistoryMessage(not_null<History*> history, MsgId id, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, const TextWithEntities &textWithEntities)
-	: HistoryItem(history, id, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+: HistoryItem(history, id, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, MTPnullMarkup);
 
 	setText(textWithEntities);
 }
 
 HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, DocumentData *doc, const QString &caption, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	initMediaFromDocument(doc, caption);
@@ -743,7 +770,7 @@ HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmess
 }
 
 HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, PhotoData *photo, const QString &caption, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	_media = std::make_unique<HistoryPhoto>(this, photo, caption);
@@ -751,7 +778,7 @@ HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmess
 }
 
 HistoryMessage::HistoryMessage(not_null<History*> history, MsgId msgId, MTPDmessage::Flags flags, MsgId replyTo, UserId viaBotId, QDateTime date, UserId from, const QString &postAuthor, GameData *game, const MTPReplyMarkup &markup)
-	: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
+: HistoryItem(history, msgId, flags, date, (flags & MTPDmessage::Flag::f_from_id) ? from : 0) {
 	createComponentsHelper(flags, replyTo, viaBotId, postAuthor, markup);
 
 	_media = std::make_unique<HistoryGame>(this, game);
@@ -774,7 +801,10 @@ void HistoryMessage::updateMediaInBubbleState() {
 	auto mediaHasSomethingBelow = false;
 	auto mediaHasSomethingAbove = false;
 	auto getMediaHasSomethingAbove = [this] {
-		return displayFromName() || displayForwardedFrom() || Has<HistoryMessageReply>() || Has<HistoryMessageVia>();
+		return displayFromName()
+			|| displayForwardedFrom()
+			|| Has<HistoryMessageReply>()
+			|| Has<HistoryMessageVia>();
 	};
 	auto entry = Get<HistoryMessageLogEntryOriginal>();
 	if (entry) {
@@ -816,6 +846,12 @@ void HistoryMessage::updateMediaInBubbleState() {
 	_media->setInBubbleState(computeState());
 }
 
+not_null<PeerData*> HistoryMessage::displayFrom() const {
+	return history()->peer->isSelf()
+		? senderOriginal()
+		: author();
+}
+
 void HistoryMessage::updateAdminBadgeState() {
 	auto hasAdminBadge = [&] {
 		if (auto channel = history()->peer->asChannel()) {
@@ -863,6 +899,10 @@ bool HistoryMessage::uploading() const {
 	return _media && _media->uploading();
 }
 
+bool HistoryMessage::displayRightAction() const {
+	return displayFastShare() || displayGoToOriginal();
+}
+
 bool HistoryMessage::displayFastShare() const {
 	if (_history->peer->isChannel()) {
 		return !_history->peer->isMegagroup();
@@ -874,6 +914,15 @@ bool HistoryMessage::displayFastShare() const {
 	return false;
 }
 
+bool HistoryMessage::displayGoToOriginal() const {
+	if (_history->peer->isSelf()) {
+		if (auto forwarded = Get<HistoryMessageForwarded>()) {
+			return forwarded->_savedFromPeer && forwarded->_savedFromMsgId;
+		}
+	}
+	return false;
+}
+
 void HistoryMessage::createComponents(const CreateConfig &config) {
 	uint64 mask = 0;
 	if (config.replyTo) {
@@ -941,6 +990,8 @@ void HistoryMessage::createComponents(const CreateConfig &config) {
 		forwarded->_originalSender = App::peer(config.senderOriginal);
 		forwarded->_originalId = config.originalId;
 		forwarded->_originalAuthor = config.authorOriginal;
+		forwarded->_savedFromPeer = App::peerLoaded(config.savedFromPeer);
+		forwarded->_savedFromMsgId = config.savedFromMsgId;
 	}
 	if (auto markup = Get<HistoryMessageReplyMarkup>()) {
 		if (config.mtpMarkup) {
@@ -953,6 +1004,7 @@ void HistoryMessage::createComponents(const CreateConfig &config) {
 		}
 	}
 	initTime();
+	_fromNameVersion = displayFrom()->nameVersion;
 }
 
 QString formatViewsCount(int32 views) {
@@ -1150,7 +1202,9 @@ void HistoryMessage::initDimensions() {
 			// Count parts in maxWidth(), don't count them in minHeight().
 			// They will be added in resizeGetHeight() anyway.
 			if (displayFromName()) {
-				auto namew = st::msgPadding.left() + author()->nameText.maxWidth() + st::msgPadding.right();
+				auto namew = st::msgPadding.left()
+					+ displayFrom()->nameText.maxWidth()
+					+ st::msgPadding.right();
 				if (via && !forwarded) {
 					namew += st::msgServiceFont->spacew + via->_maxWidth;
 				}
@@ -1210,13 +1264,21 @@ bool HistoryMessage::drawBubble() const {
 	return _media ? (!emptyText() || _media->needsBubble()) : !isEmpty();
 }
 
+bool HistoryMessage::hasFromName() const {
+	return !hasOutLayout()
+		&& (!history()->peer->isUser() || history()->peer->isSelf());
+}
+
 QRect HistoryMessage::countGeometry() const {
 	auto maxwidth = qMin(st::msgMaxWidth, _maxw);
 	if (_media && _media->currentWidth() < maxwidth) {
 		maxwidth = qMax(_media->currentWidth(), qMin(maxwidth, plainMaxWidth()));
 	}
 
-	auto contentLeft = (!isPost() && out() && !Adaptive::ChatWide()) ? st::msgMargin.right() : st::msgMargin.left();
+	auto outLayout = hasOutLayout();
+	auto contentLeft = (outLayout && !Adaptive::ChatWide())
+		? st::msgMargin.right()
+		: st::msgMargin.left();
 	if (hasFromPhoto()) {
 		contentLeft += st::msgPhotoSkip;
 //	} else if (!Adaptive::Wide() && !out() && !fromChannel() && st::msgPhotoSkip - (hmaxwidth - hwidth) > 0) {
@@ -1224,8 +1286,11 @@ QRect HistoryMessage::countGeometry() const {
 	}
 
 	auto contentWidth = width() - st::msgMargin.left() - st::msgMargin.right();
+	if (history()->peer->isSelf() && !outLayout) {
+		contentWidth -= st::msgPhotoSkip;
+	}
 	if (contentWidth > maxwidth) {
-		if (!isPost() && out() && !Adaptive::ChatWide()) {
+		if (outLayout && !Adaptive::ChatWide()) {
 			contentLeft += contentWidth - maxwidth;
 		}
 		contentWidth = maxwidth;
@@ -1241,7 +1306,7 @@ void HistoryMessage::fromNameUpdated(int32 width) const {
 			AdminBadgeText());
 		width -= st::msgPadding.right() + badgeWidth;
 	}
-	_authorNameVersion = author()->nameVersion;
+	_fromNameVersion = displayFrom()->nameVersion;
 	if (!Has<HistoryMessageForwarded>()) {
 		if (auto via = Get<HistoryMessageVia>()) {
 			via->resize(width
@@ -1313,6 +1378,9 @@ void HistoryMessage::applyEditionToEmpty() {
 
 bool HistoryMessage::displayForwardedFrom() const {
 	if (auto forwarded = Get<HistoryMessageForwarded>()) {
+		if (history()->peer->isSelf()) {
+			return false;
+		}
 		return Has<HistoryMessageVia>()
 			|| !_media
 			|| !_media->isDisplayed()
@@ -1550,11 +1618,12 @@ int HistoryMessage::infoWidth() const {
 	} else if (id < 0 && history()->peer->isSelf()) {
 		result += st::historySendStateSpace;
 	}
-	if (out() && !isPost()) {
+	if (hasOutLayout()) {
 		result += st::historySendStateSpace;
 	}
 	return result;
 }
+
 int HistoryMessage::timeLeft() const {
 	int result = 0;
 	if (auto views = Get<HistoryMessageViews>()) {
@@ -1568,7 +1637,7 @@ int HistoryMessage::timeLeft() const {
 void HistoryMessage::drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const {
 	p.setFont(st::msgDateFont);
 
-	bool outbg = out() && !isPost();
+	bool outbg = hasOutLayout();
 	bool invertedsprites = (type == InfoDisplayOverImage || type == InfoDisplayOverBackground);
 	int32 infoRight = right, infoBottom = bottom;
 	switch (type) {
@@ -1682,7 +1751,9 @@ void HistoryMessage::setId(MsgId newId) {
 }
 
 void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const {
-	bool outbg = out() && !isPost(), bubble = drawBubble(), selected = (selection == FullSelection);
+	auto outbg = hasOutLayout();
+	auto bubble = drawBubble();
+	auto selected = (selection == FullSelection);
 
 	auto g = countGeometry();
 	if (g.width() < 1) {
@@ -1733,7 +1804,7 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 	}
 
 	if (bubble) {
-		if (displayFromName() && author()->nameVersion > _authorNameVersion) {
+		if (displayFromName() && displayFrom()->nameVersion > _fromNameVersion) {
 			fromNameUpdated(g.width());
 		}
 
@@ -1799,10 +1870,10 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 		if (needDrawInfo) {
 			HistoryMessage::drawInfo(p, g.left() + g.width(), g.top() + g.height(), 2 * g.left() + g.width(), selected, InfoDisplayDefault);
 		}
-		if (displayFastShare()) {
+		if (displayRightAction()) {
 			auto fastShareLeft = g.left() + g.width() + st::historyFastShareLeft;
 			auto fastShareTop = g.top() + g.height() - st::historyFastShareBottom - st::historyFastShareSize;
-			drawFastShare(p, fastShareLeft, fastShareTop, width());
+			drawRightAction(p, fastShareLeft, fastShareTop, width());
 		}
 	} else if (_media) {
 		p.translate(g.topLeft());
@@ -1818,7 +1889,7 @@ void HistoryMessage::draw(Painter &p, QRect clip, TextSelection selection, TimeM
 	}
 }
 
-void HistoryMessage::drawFastShare(Painter &p, int left, int top, int outerWidth) const {
+void HistoryMessage::drawRightAction(Painter &p, int left, int top, int outerWidth) const {
 	{
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::msgServiceBg);
@@ -1826,7 +1897,11 @@ void HistoryMessage::drawFastShare(Painter &p, int left, int top, int outerWidth
 		PainterHighQualityEnabler hq(p);
 		p.drawEllipse(rtlrect(left, top, st::historyFastShareSize, st::historyFastShareSize, outerWidth));
 	}
-	st::historyFastShareIcon.paint(p, left, top, outerWidth);
+	if (displayFastShare()) {
+		st::historyFastShareIcon.paint(p, left, top, outerWidth);
+	} else {
+		st::historyGoToOriginalIcon.paint(p, left, top, outerWidth);
+	}
 }
 
 void HistoryMessage::paintFromName(Painter &p, QRect &trect, bool selected) const {
@@ -1849,7 +1924,7 @@ void HistoryMessage::paintFromName(Painter &p, QRect &trect, bool selected) cons
 		} else {
 			p.setPen(FromNameFg(author(), selected));
 		}
-		author()->nameText.drawElided(p, availableLeft, trect.top(), availableWidth);
+		displayFrom()->nameText.drawElided(p, availableLeft, trect.top(), availableWidth);
 		auto skipWidth = author()->nameText.maxWidth() + st::msgServiceFont->spacew;
 		availableLeft += skipWidth;
 		availableWidth -= skipWidth;
@@ -1857,7 +1932,7 @@ void HistoryMessage::paintFromName(Painter &p, QRect &trect, bool selected) cons
 		auto forwarded = Get<HistoryMessageForwarded>();
 		auto via = Get<HistoryMessageVia>();
 		if (via && !forwarded && availableWidth > 0) {
-			auto outbg = out() && !isPost();
+			auto outbg = hasOutLayout();
 			p.setPen(selected ? (outbg ? st::msgOutServiceFgSelected : st::msgInServiceFgSelected) : (outbg ? st::msgOutServiceFg : st::msgInServiceFg));
 			p.drawText(availableLeft, trect.top() + st::msgServiceFont->ascent, via->_text);
 			auto skipWidth = via->_width + st::msgServiceFont->spacew;
@@ -1920,7 +1995,7 @@ void HistoryMessage::paintViaBotIdInfo(Painter &p, QRect &trect, bool selected)
 }
 
 void HistoryMessage::paintText(Painter &p, QRect &trect, TextSelection selection) const {
-	auto outbg = out() && !isPost();
+	auto outbg = hasOutLayout();
 	auto selected = (selection == FullSelection);
 	p.setPen(outbg ? (selected ? st::historyTextOutFgSelected : st::historyTextOutFg) : (selected ? st::historyTextInFgSelected : st::historyTextInFg));
 	p.setFont(st::msgFont);
@@ -1958,6 +2033,9 @@ int HistoryMessage::performResizeGetHeight() {
 	if (width() < st::msgMinWidth) return _height;
 
 	auto contentWidth = width() - (st::msgMargin.left() + st::msgMargin.right());
+	if (history()->peer->isSelf() && !hasOutLayout()) {
+		contentWidth -= st::msgPhotoSkip;
+	}
 	if (contentWidth < st::msgPadding.left() + st::msgPadding.right() + 1) {
 		contentWidth = st::msgPadding.left() + st::msgPadding.right() + 1;
 	} else if (contentWidth > st::msgMaxWidth) {
@@ -2157,11 +2235,11 @@ HistoryTextState HistoryMessage::getState(QPoint point, HistoryStateRequest requ
 				result.cursor = HistoryInDateCursorState;
 			}
 		}
-		if (displayFastShare()) {
+		if (displayRightAction()) {
 			auto fastShareLeft = g.left() + g.width() + st::historyFastShareLeft;
 			auto fastShareTop = g.top() + g.height() - st::historyFastShareBottom - st::historyFastShareSize;
 			if (QRect(fastShareLeft, fastShareTop, st::historyFastShareSize, st::historyFastShareSize).contains(point)) {
-				result.link = fastShareLink();
+				result.link = rightActionLink();
 			}
 		}
 	} else if (_media) {
@@ -2180,15 +2258,26 @@ HistoryTextState HistoryMessage::getState(QPoint point, HistoryStateRequest requ
 	return result;
 }
 
-ClickHandlerPtr HistoryMessage::fastShareLink() const {
+ClickHandlerPtr HistoryMessage::rightActionLink() const {
-	if (!_fastShareLink) {
+	if (!_rightActionLink) {
-		_fastShareLink = MakeShared<LambdaClickHandler>([id = fullId()] {
+		const auto itemId = fullId();
-			if (auto item = App::histItemById(id)) {
+		const auto forwarded = Get<HistoryMessageForwarded>();
-				FastShareMessage(item->toHistoryMessage());
+		const auto savedFromPeer = forwarded ? forwarded->_savedFromPeer : nullptr;
+		const auto savedFromMsgId = forwarded ? forwarded->_savedFromMsgId : 0;
+		_rightActionLink = MakeShared<LambdaClickHandler>([=] {
+			if (auto item = App::histItemById(itemId)) {
+				if (savedFromPeer && savedFromMsgId) {
+					App::wnd()->controller()->showPeerHistory(
+						savedFromPeer,
+						Window::SectionShow::Way::Forward,
+						savedFromMsgId);
+				} else {
+					FastShareMessage(item->toHistoryMessage());
+				}
 			}
 		});
 	}
-	return _fastShareLink;
+	return _rightActionLink;
 }
 
 // Forward to _media.
@@ -2245,13 +2334,14 @@ void HistoryMessage::updatePressed(QPoint point) {
 bool HistoryMessage::getStateFromName(QPoint point, QRect &trect, HistoryTextState *outResult) const {
 	if (displayFromName()) {
 		if (point.y() >= trect.top() && point.y() < trect.top() + st::msgNameFont->height) {
-			if (point.x() >= trect.left() && point.x() < trect.left() + trect.width() && point.x() < trect.left() + author()->nameText.maxWidth()) {
+			auto user = displayFrom();
-				outResult->link = author()->openLink();
+			if (point.x() >= trect.left() && point.x() < trect.left() + trect.width() && point.x() < trect.left() + user->nameText.maxWidth()) {
+				outResult->link = user->openLink();
 				return true;
 			}
 			auto forwarded = Get<HistoryMessageForwarded>();
 			auto via = Get<HistoryMessageVia>();
-			if (via && !forwarded && point.x() >= trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew && point.x() < trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew + via->_width) {
+			if (via && !forwarded && point.x() >= trect.left() + author()->nameText.maxWidth() + st::msgServiceFont->spacew && point.x() < trect.left() + user->nameText.maxWidth() + st::msgServiceFont->spacew + via->_width) {
 				outResult->link = via->_lnk;
 				return true;
 			}
@@ -2375,7 +2465,14 @@ bool HistoryMessage::displayFromPhoto() const {
 }
 
 bool HistoryMessage::hasFromPhoto() const {
-	return (Adaptive::ChatWide() || (!out() && !history()->peer->isUser())) && !isPost() && !isEmpty();
+	if (isPost() || isEmpty()) {
+		return false;
+	} else if (Adaptive::ChatWide()) {
+		return true;
+	} else if (history()->peer->isSelf()) {
+		return Has<HistoryMessageForwarded>();
+	}
+	return !out() && !history()->peer->isUser();
 }
 
 HistoryMessage::~HistoryMessage() {

Telegram/SourceFiles/history/history_message.h

@@ -62,9 +62,7 @@ public:
 	bool hasBubble() const override {
 		return drawBubble();
 	}
-	bool hasFromName() const {
+	bool hasFromName() const;
-		return (!out() || isPost()) && !history()->peer->isUser();
-	}
 	bool displayFromName() const {
 		if (!hasFromName()) return false;
 		if (isAttachedToPrevious()) return false;
@@ -72,17 +70,17 @@ public:
 	}
 	bool displayEditedBadge(bool hasViaBotOrInlineMarkup) const;
 	bool uploading() const;
-	bool displayFastShare() const override;
+	bool displayRightAction() const override;
 
 	void applyGroupAdminChanges(
 		const base::flat_map<UserId, bool> &changes) override;
 
 	void drawInfo(Painter &p, int32 right, int32 bottom, int32 width, bool selected, InfoDisplayType type) const override;
-	void drawFastShare(Painter &p, int left, int top, int outerWidth) const override;
+	void drawRightAction(Painter &p, int left, int top, int outerWidth) const override;
 	void setViewsCount(int32 count) override;
 	void setId(MsgId newId) override;
 	void draw(Painter &p, QRect clip, TextSelection selection, TimeMs ms) const override;
-	ClickHandlerPtr fastShareLink() const override;
+	ClickHandlerPtr rightActionLink() const override;
 
 	void dependencyItemRemoved(HistoryItem *dependency) override;
 
@@ -129,6 +127,8 @@ public:
 		return HistoryItem::viewsCount();
 	}
 
+	not_null<PeerData*> displayFrom() const;
+
 	bool updateDependencyItem() override {
 		if (auto reply = Get<HistoryMessageReply>()) {
 			return reply->updateData(this, true);
@@ -191,10 +191,14 @@ private:
 	void setMedia(const MTPMessageMedia *media);
 	void setReplyMarkup(const MTPReplyMarkup *markup);
 
+	bool displayFastShare() const;
+	bool displayGoToOriginal() const;
+
 	QString _timeText;
 	int _timeWidth = 0;
 
-	mutable ClickHandlerPtr _fastShareLink;
+	mutable ClickHandlerPtr _rightActionLink;
+	mutable int32 _fromNameVersion = 0;
 
 	struct CreateConfig {
 		MsgId replyTo = 0;
@@ -203,6 +207,8 @@ private:
 		QString author;
 		PeerId senderOriginal = 0;
 		MsgId originalId = 0;
+		PeerId savedFromPeer = 0;
+		MsgId savedFromMsgId = 0;
 		QString authorOriginal;
 		QDateTime originalDate;
 		QDateTime editDate;

Telegram/SourceFiles/history/history_widget.cpp

@@ -3882,7 +3882,7 @@ void HistoryWidget::forwardMessage() {
 
 	auto items = SelectedItemSet();
 	items.insert(item->id, item);
-	App::main()->showForwardLayer(items);
+	App::main()->showForwardBox(std::move(items));
 }
 
 void HistoryWidget::selectMessage() {
@@ -5280,7 +5280,7 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		if (readyToForward()) {
 			auto items = _toForward;
 			App::main()->cancelForwarding(_history);
-			App::main()->showForwardLayer(items);
+			App::main()->showForwardBox(std::move(items));
 		} else {
 			Ui::showPeerHistory(_peer, _editMsgId ? _editMsgId : replyToId());
 		}
@@ -6178,7 +6178,7 @@ void HistoryWidget::handlePeerUpdate() {
 
 void HistoryWidget::onForwardSelected() {
 	if (!_list) return;
-	App::main()->showForwardLayer(getSelectedItems());
+	App::main()->showForwardBox(getSelectedItems());
 }
 
 void HistoryWidget::confirmDeleteContextItem() {

Telegram/SourceFiles/history/history_widget.h

@@ -485,6 +485,7 @@ private:
 	void showNextUnreadMention();
 	void handlePeerUpdate();
 	void setMembersShowAreaActive(bool active);
+	void forwardItems(SelectedItemSet &&items);
 
 	void highlightMessage(MsgId universalMessageId);
 	void adjustHighlightedMessageToMigrated();

Telegram/SourceFiles/mainwidget.cpp

@@ -1013,6 +1013,20 @@ void MainWidget::showSendPathsLayer() {
 	hiderLayer(object_ptr<HistoryHider>(this));
 }
 
+void MainWidget::showForwardBox(SelectedItemSet &&items) {
+	auto controller = std::make_unique<ChooseRecipientBoxController>(
+		[items = std::move(items)](not_null<PeerData*> peer) {
+			App::main()->setForwardDraft(peer->id, items);
+		});
+	Ui::show(Box<PeerListBox>(
+		std::move(controller),
+		[](not_null<PeerListBox*> box) {
+			box->addButton(langFactory(lng_cancel), [box] {
+				box->closeBox();
+			});
+		}));
+}
+
 void MainWidget::deleteLayer(int selectedCount) {
 	if (selectedCount) {
 		auto forDelete = true;

Telegram/SourceFiles/mainwidget.h

@@ -180,6 +180,7 @@ public:
 
 	void showForwardLayer(const SelectedItemSet &items);
 	void showSendPathsLayer();
+	void showForwardBox(SelectedItemSet &&items);
 	void deleteLayer(int selectedCount = 0); // 0 - context item
 	void cancelUploadLayer();
 	void shareContactLayer(UserData *contact);

Telegram/SourceFiles/mediaview.cpp

@@ -939,7 +939,7 @@ void MediaView::onForward() {
 	if (auto main = App::main()) {
 		auto items = SelectedItemSet();
 		items.insert(item->id, item);
-		main->showForwardLayer(items);
+		main->showForwardBox(std::move(items));
 	}
 }