diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index a3ee4082d0..3563bf525d 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1038,6 +1038,12 @@ PointState Message::pointState(QPoint point) const {
 			}
 
 			auto trect = g.marginsRemoved(st::msgPadding);
+			if (_viewButton) {
+				trect.setHeight(trect.height() - _viewButton->height());
+				if (mediaDisplayed) {
+					trect.setHeight(trect.height() - st::mediaInBubbleSkip);
+				}
+			}
 			if (mediaOnBottom) {
 				trect.setHeight(trect.height() + st::msgPadding.bottom());
 			}
@@ -1213,6 +1219,12 @@ TextState Message::textState(
 		}
 
 		auto trect = bubble.marginsRemoved(st::msgPadding);
+		if (_viewButton) {
+			trect.setHeight(trect.height() - _viewButton->height());
+			if (mediaDisplayed) {
+				trect.setHeight(trect.height() - st::mediaInBubbleSkip);
+			}
+		}
 		if (mediaOnBottom) {
 			trect.setHeight(trect.height()
 				+ st::msgPadding.bottom()