diff --git a/src/components/middle/message/CommentButton.scss b/src/components/middle/message/CommentButton.scss
index d134684ce..b0f760cd2 100644
--- a/src/components/middle/message/CommentButton.scss
+++ b/src/components/middle/message/CommentButton.scss
@@ -87,10 +87,6 @@
       text-align: center;
     }
 
-    .no-action-button & {
-      bottom: 0;
-    }
-
     &:hover {
       background-color: var(--pattern-color);
       backdrop-filter: brightness(115%);
diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 9d68cd82a..0f8408506 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -1,5 +1,3 @@
-import type { FC } from '../../../lib/teact/teact';
-import type React from '../../../lib/teact/teact';
 import {
   memo,
   useCallback,
@@ -345,7 +343,7 @@ const QUICK_REACTION_SIZE = 1.75 * REM;
 const EXTRA_SPACE_FOR_REACTIONS = 2.25 * REM;
 const MAX_REASON_LENGTH = 200;
 
-const Message: FC<OwnProps & StateProps> = ({
+const Message = ({
   message,
   observeIntersectionForBottom,
   observeIntersectionForLoading,
@@ -454,7 +452,7 @@ const Message: FC<OwnProps & StateProps> = ({
   minFutureTime,
   webPage,
   onIntersectPinnedMessage,
-}) => {
+}: OwnProps & StateProps) => {
   const {
     toggleMessageSelection,
     clickBotInlineButton,
@@ -583,7 +581,6 @@ const Message: FC<OwnProps & StateProps> = ({
     !(isContextMenuShown || isInSelectMode || isForwarding)
     && !isInDocumentGroupNotLast
     && !isStoryMention
-    && !((sticker || hasAnimatedEmoji) && asForwarded)
   );
   const canForward = isChannel && !isScheduled && message.isForwardingAllowed
     && !isChatProtected;
@@ -756,7 +753,6 @@ const Message: FC<OwnProps & StateProps> = ({
     isJustAdded && 'is-just-added',
     (hasActiveReactions || shouldPlayEffect) && 'has-active-effect',
     isStoryMention && 'is-story-mention',
-    !canShowActionButton && 'no-action-button',
   );
 
   const text = textMessage && getMessageContent(textMessage).text;
@@ -816,8 +812,8 @@ const Message: FC<OwnProps & StateProps> = ({
     hasThread: hasThread && !noComments,
     forceSenderName,
     hasCommentCounter: hasThread && repliesThreadInfo.messagesCount > 0,
-    hasCommentButton: withCommentButton,
-    hasActionButton: canForward || canFocus,
+    hasBottomCommentButton: withCommentButton && !isCustomShape,
+    hasActionButton: canForward || canFocus || (withCommentButton && isCustomShape),
     hasReactions,
     isGeoLiveActive: location?.mediaType === 'geoLive' && !isGeoLiveExpired(message),
     withVoiceTranscription,
@@ -1763,7 +1759,7 @@ const Message: FC<OwnProps & StateProps> = ({
               )}
             </div>
           )}
-          {withCommentButton && !(canShowActionButton && isCustomShape) && (
+          {withCommentButton && !isCustomShape && (
             <CommentButton
               threadInfo={repliesThreadInfo}
               disabled={noComments}
diff --git a/src/components/middle/message/helpers/buildContentClassName.ts b/src/components/middle/message/helpers/buildContentClassName.ts
index b4644fad3..42b6d5bb5 100644
--- a/src/components/middle/message/helpers/buildContentClassName.ts
+++ b/src/components/middle/message/helpers/buildContentClassName.ts
@@ -18,7 +18,7 @@ export function buildContentClassName(
     hasThread,
     forceSenderName,
     hasCommentCounter,
-    hasCommentButton,
+    hasBottomCommentButton,
     hasActionButton,
     hasReactions,
     isGeoLiveActive,
@@ -35,7 +35,7 @@ export function buildContentClassName(
     hasThread?: boolean;
     forceSenderName?: boolean;
     hasCommentCounter?: boolean;
-    hasCommentButton?: boolean;
+    hasBottomCommentButton?: boolean;
     hasActionButton?: boolean;
     hasReactions?: boolean;
     isGeoLiveActive?: boolean;
@@ -202,7 +202,7 @@ export function buildContentClassName(
       classNames.push('has-fact-check');
     }
 
-    if (isLastInGroup && !hasInlineKeyboard && (photo || !isMediaWithNoText || hasCommentButton)) {
+    if (isLastInGroup && !hasInlineKeyboard && (photo || !isMediaWithNoText || hasBottomCommentButton)) {
       classNames.push('has-appendix');
     }
   }