diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 0a45f3e5c..d68a55b6b 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -791,7 +791,7 @@ const Message: FC<OwnProps & StateProps> = ({
       hasSubheader && 'with-subheader',
       noMediaCorners && 'no-media-corners',
     );
-    const hasCustomAppendix = isLastInGroup && !hasText && !asForwarded && !hasThread;
+    const hasCustomAppendix = isLastInGroup && !hasText && !asForwarded && !withCommentButton;
     const textContentClass = buildClassName(
       'text-content',
       'clearfix',