diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 03ad3af2..619b56fa 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -1301,8 +1301,20 @@ func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, context: NSM
 			if fetchedUsers.first(where: { $0.num == packet.from }) != nil {
 				newMessage.fromUser = fetchedUsers.first(where: { $0.num == packet.from })
 			}
-
-			newMessage.messagePayload = messageText
+			let detector = try! NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
+			let matches = detector.matches(in: messageText, options: [], range: NSRange(location: 0, length: messageText.utf16.count))
+			if matches.count > 0 {
+				var messageWithLink = ""
+				for match in matches {
+					guard let range = Range(match.range, in: messageText) else { continue }
+					let url = messageText[range]
+					print(match.url?.baseURL)
+					messageWithLink = messageText.replacingOccurrences(of: url, with: "[\(String(match.url?.host ?? "Link"))](\(url))")
+				}
+				newMessage.messagePayload = messageWithLink
+			} else {
+				newMessage.messagePayload = messageText
+			}
 			newMessage.fromUser?.objectWillChange.send()
 			newMessage.toUser?.objectWillChange.send()
 			
diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index 72a81c15..0df569c6 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -60,7 +60,9 @@ struct ChannelMessageList: View {
 										.offset(y: -5)
 								}
 								VStack(alignment: currentUser ? .trailing : .leading) {
-									Text(message.messagePayload ?? "EMPTY MESSAGE")
+									let markdownText: LocalizedStringKey =  LocalizedStringKey.init(message.messagePayload ?? "EMPTY MESSAGE")
+
+									Text(markdownText)
 										.padding(10)
 										.foregroundColor(.white)
 										.background(currentUser ? .accentColor : Color(.gray))
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 391fab03..3bd5ca57 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -61,7 +61,9 @@ struct UserMessageList: View {
 											.offset(y: -5)
 									}
 									VStack(alignment: currentUser ? .trailing : .leading) {
-										Text(message.messagePayload ?? "EMPTY MESSAGE")
+										let markdownText: LocalizedStringKey =  LocalizedStringKey.init(message.messagePayload ?? "EMPTY MESSAGE")
+
+										Text(markdownText)
 											.padding(10)
 											.foregroundColor(.white)
 											.background(currentUser ? .accentColor : Color(.gray))