diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 10a3d69b..24a577b2 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -1027,7 +1027,7 @@ func textMessageAppPacket(
 								subtitle: "AKA \(newMessage.fromUser?.shortName ?? "?")",
 								content: messageText!,
 								target: "messages",
-								path: "meshtastic:///messages?userNum=\(newMessage.fromUser?.num ?? 0)&messageId=\(newMessage.messageId)",
+								path:  "meshtastic:///messages?userNum=\(newMessage.fromUser?.num ?? 0)&messageId=\(newMessage.isEmoji ? newMessage.replyID : newMessage.messageId)",
 								messageId: newMessage.messageId,
 								channel: newMessage.channel,
 								userNum: Int64(packet.from),
@@ -1058,7 +1058,7 @@ func textMessageAppPacket(
 											subtitle: "AKA \(newMessage.fromUser?.shortName ?? "?")",
 											content: messageText!,
 											target: "messages",
-											path: "meshtastic:///messages?channelId=\(newMessage.channel)&messageId=\(newMessage.messageId)",
+											path: "meshtastic:///messages?channelId=\(newMessage.channel)&messageId=\(newMessage.isEmoji ? newMessage.replyID : newMessage.messageId)",
 											messageId: newMessage.messageId,
 											channel: newMessage.channel,
 											userNum: Int64(newMessage.fromUser?.userId ?? "0"),