diff --git a/app/containers/message/Reply.tsx b/app/containers/message/Reply.tsx
index 8c5fb6b88..1bf0a56b2 100644
--- a/app/containers/message/Reply.tsx
+++ b/app/containers/message/Reply.tsx
@@ -3,6 +3,7 @@ import { StyleSheet, Text, View } from 'react-native';
 import moment from 'moment';
 import { dequal } from 'dequal';
 import FastImage from 'react-native-fast-image';
+import parse from 'url-parse';
 
 import Touchable from './Touchable';
 import Markdown from '../markdown';
@@ -225,6 +226,12 @@ const Reply = React.memo(
 			openLink(url, theme);
 		};
 
+		let attachmentId = '';
+		if (attachment.message_link) {
+			const parsedUrl = parse(attachment.message_link, true);
+			attachmentId = parsedUrl.query.msg || messageId;
+		}
+
 		let { borderColor } = themes[theme];
 		if (attachment.color) {
 			borderColor = attachment.color;
@@ -257,7 +264,7 @@ const Reply = React.memo(
 							timeFormat={timeFormat}
 							style={[{ color: themes[theme].auxiliaryTintColor, fontSize: 14, marginBottom: 8 }]}
 							isReply
-							id={messageId}
+							id={attachmentId}
 						/>
 						<Fields attachment={attachment} getCustomEmoji={getCustomEmoji} theme={theme} />
 						{loading ? (