diff --git a/src/api/gramjs/apiBuilders/messages.ts b/src/api/gramjs/apiBuilders/messages.ts
index 09ead162b..559304652 100644
--- a/src/api/gramjs/apiBuilders/messages.ts
+++ b/src/api/gramjs/apiBuilders/messages.ts
@@ -198,7 +198,10 @@ export function buildApiMessageWithChatId(
   const isEdited = Boolean(mtpMessage.editDate) && !mtpMessage.editHide;
   const {
     inlineButtons, keyboardButtons, keyboardPlaceholder, isKeyboardSingleUse, isKeyboardSelective,
-  } = buildReplyButtons(mtpMessage.replyMarkup, mtpMessage.id) || {};
+  } = buildReplyButtons(
+    mtpMessage.replyMarkup,
+    mtpMessage.media instanceof GramJs.MessageMediaInvoice ? mtpMessage.media.receiptMsgId : undefined,
+  ) || {};
   const { mediaUnread: isMediaUnread, postAuthor } = mtpMessage;
   const groupedId = mtpMessage.groupedId && String(mtpMessage.groupedId);
   const isInAlbum = Boolean(groupedId) && !(content.document || content.audio || content.sticker);
diff --git a/src/components/left/main/Chat.scss b/src/components/left/main/Chat.scss
index 403c5e12b..fb68c25b9 100644
--- a/src/components/left/main/Chat.scss
+++ b/src/components/left/main/Chat.scss
@@ -400,6 +400,12 @@
         }
       }
     }
+
+    .star-amount-icon {
+      vertical-align: text-top;
+      line-height: initial;
+      margin-inline: 0;
+    }
   }
 
   &[dir="rtl"] {
diff --git a/src/components/middle/message/ActionMessageText.tsx b/src/components/middle/message/ActionMessageText.tsx
index 4fc89796d..1bcea70dd 100644
--- a/src/components/middle/message/ActionMessageText.tsx
+++ b/src/components/middle/message/ActionMessageText.tsx
@@ -668,7 +668,9 @@ const ActionMessageText = ({
 
       case 'suggestProfilePhoto': {
         const actionPeer = (isOutgoing ? chat : sender)!;
-        const actionPeerLink = renderPeerLink(actionPeer.id, getPeerTitle(lang, actionPeer) || userFallbackText);
+        const actionPeerLink = renderPeerLink(
+          actionPeer.id, getPeerTitle(lang, actionPeer) || userFallbackText, asPreview,
+        );
 
         return translateWithYou(lang, 'ActionSuggestedPhoto', isOutgoing, { user: actionPeerLink });
       }