diff --git a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
index 4b61a44561731b21baf83ce3a3e077de26a8350d..14d98385856500750a4655f3cfd97a3bd13489d5 100644
--- a/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/QuoteAttachment.tsx
@@ -65,7 +65,7 @@ export const QuoteAttachment = ({ attachment }: QuoteAttachmentProps): ReactElem
 							</Box>
 						)}
 					</AttachmentAuthor>
-					{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text}
+					{attachment.md ? <MessageContentBody md={attachment.md} /> : attachment.text.substring(attachment.text.indexOf('\n') + 1)}
 					{attachment.attachments && (
 						<AttachmentInner>
 							<Attachments attachments={attachment.attachments} />
diff --git a/apps/meteor/lib/createQuoteAttachment.ts b/apps/meteor/lib/createQuoteAttachment.ts
index 4c3e4dba20e7865c7505114b77423f65c49a1967..c7247d5ae86303922c8290527198a003d9c05dcb 100644
--- a/apps/meteor/lib/createQuoteAttachment.ts
+++ b/apps/meteor/lib/createQuoteAttachment.ts
@@ -6,6 +6,7 @@ import { getUserAvatarURL } from '../app/utils/lib/getUserAvatarURL';
 export function createQuoteAttachment(message: IMessage | ITranslatedMessage, messageLink: string) {
 	return {
 		text: message.msg,
+		md: message.md,
 		...(isTranslatedMessage(message) && { translations: message?.translations }),
 		message_link: messageLink,
 		author_name: message.alias || message.u.username,