diff --git a/src/components/middle/message/Message.scss b/src/components/middle/message/Message.scss index 71a3078b0..4c2e31dff 100644 --- a/src/components/middle/message/Message.scss +++ b/src/components/middle/message/Message.scss @@ -646,7 +646,7 @@ .message-content { &.has-replies:not(.custom-shape), - &.has-footer:not(.web-page) { + &.has-footer:not(.web-page):not(.is-forwarded) { .media-inner, .Album { --border-bottom-left-radius: 0; @@ -654,7 +654,7 @@ } } - &.text.is-inverted-media { + &.text.is-inverted-media:not(.is-forwarded) { .Album, .media-inner { --border-top-left-radius: 0; diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx index 3a6301fa8..11b5676d3 100644 --- a/src/components/middle/message/Message.tsx +++ b/src/components/middle/message/Message.tsx @@ -918,7 +918,7 @@ const Message: FC = ({ contentWidth = width; } calculatedWidth = Math.max(getMinMediaWidth(text?.text, isMediaWithCommentButton), width); - if (invoice?.extendedMedia && calculatedWidth - width > NO_MEDIA_CORNERS_THRESHOLD) { + if (!asForwarded && invoice?.extendedMedia && calculatedWidth - width > NO_MEDIA_CORNERS_THRESHOLD) { noMediaCorners = true; } } @@ -926,7 +926,7 @@ const Message: FC = ({ calculatedWidth = Math.max( getMinMediaWidth(text?.text, isMediaWithCommentButton), albumLayout.containerStyle.width, ); - if (calculatedWidth - albumLayout.containerStyle.width > NO_MEDIA_CORNERS_THRESHOLD) { + if (!asForwarded && calculatedWidth - albumLayout.containerStyle.width > NO_MEDIA_CORNERS_THRESHOLD) { noMediaCorners = true; } }