diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index c3384193..29583cf4 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -750,6 +750,7 @@ func textMessageAppPacket(packet: MeshPacket, connectedNode: Int64, context: NSM
 			newMessage.rssi = packet.rxRssi
 			newMessage.isEmoji = packet.decoded.emoji == 1
 			newMessage.channel = Int32(packet.channel)
+			newMessage.portNum = Int32(packet.decoded.portnum.rawValue)
 
 			if packet.decoded.replyID > 0 {
 				newMessage.replyID = Int64(packet.decoded.replyID)
diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV16.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV16.xcdatamodel/contents
index 87e34883..1e80b42a 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV16.xcdatamodel/contents
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV16.xcdatamodel/contents
@@ -141,6 +141,7 @@
         <attribute name="messagePayload" optional="YES" attributeType="String" defaultValueString=""/>
         <attribute name="messagePayloadMarkdown" optional="YES" attributeType="String"/>
         <attribute name="messageTimestamp" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="portNum" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="realACK" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="receivedACK" attributeType="Boolean" usesScalarValueType="YES"/>
         <attribute name="replyID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift
index c11a02b1..83e30709 100644
--- a/Meshtastic/Views/Messages/ChannelMessageList.swift
+++ b/Meshtastic/Views/Messages/ChannelMessageList.swift
@@ -63,12 +63,24 @@ struct ChannelMessageList: View {
 								VStack(alignment: currentUser ? .trailing : .leading) {
 									let markdownText: LocalizedStringKey =  LocalizedStringKey.init(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE"))
 									let linkBlue = Color(red: 0.4627, green: 0.8392, blue: 1) /* #76d6ff */
+									let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
+									
 									Text(markdownText)
 										.tint(linkBlue)
 										.padding(10)
 										.foregroundColor(.white)
 										.background(currentUser ? .accentColor : Color(.gray))
 										.cornerRadius(15)
+										.overlay(
+											VStack {
+												isDetectionSensorMessage ? Image(systemName: "sensor.fill")
+														.padding()
+														.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topTrailing)
+														.foregroundStyle(Color.orange)
+														.offset(x: 20, y: -20)
+												: nil
+											}
+										)
 										.contextMenu {
 											VStack {
 												Text("channel")+Text(": \(message.channel)")
diff --git a/Meshtastic/Views/Nodes/NodeMap.swift b/Meshtastic/Views/Nodes/NodeMap.swift
index 16043adc..eb830668 100644
--- a/Meshtastic/Views/Nodes/NodeMap.swift
+++ b/Meshtastic/Views/Nodes/NodeMap.swift
@@ -16,6 +16,7 @@ struct NodeMap: View {
 	@EnvironmentObject var bleManager: BLEManager
 	
 	@ObservedObject var tileManager = OfflineTileManager.shared
+	@StateObject var appState = AppState.shared
 	
 	@State var selectedMapLayer: MapLayer = UserDefaults.mapLayer
 	@State var enableMapRecentering: Bool = UserDefaults.enableMapRecentering