diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index d91dded2..0ea54454 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -21,6 +21,21 @@
     },
     ": %d" : {
 
+    },
+    ".dot" : {
+
+    },
+    ".gauge" : {
+
+    },
+    ".gradient" : {
+
+    },
+    ".pill" : {
+
+    },
+    ".text" : {
+
     },
     "(Re)define PIN_GPS_EN for your board." : {
 
@@ -19154,9 +19169,6 @@
     },
     "Send" : {
 
-    },
-    "Send ${messageContent} to ${channelNumber}" : {
-
     },
     "Send a Group Message" : {
 
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index a75a4c04..badac8ec 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -872,27 +872,23 @@ func textMessageAppPacket(
 					newMessage.read = true
 				}
 			}
-			
 			if packet.decoded.replyID > 0 {
 				newMessage.replyID = Int64(packet.decoded.replyID)
 			}
-			
 			if fetchedUsers.first(where: { $0.num == packet.to }) != nil && packet.to != Constants.maximumNodeNum {
 				if !storeForwardBroadcast {
 					newMessage.toUser = fetchedUsers.first(where: { $0.num == packet.to })
 				}
 			}
-			
 			if fetchedUsers.first(where: { $0.num == packet.from }) != nil {
 				newMessage.fromUser = fetchedUsers.first(where: { $0.num == packet.from })
-				
 				if !(newMessage.fromUser?.publicKey?.isEmpty ?? true) && newMessage.toUser != nil && packet.pkiEncrypted {
 					// We have a key and it is a PKC encrypted DM, check if it matches
 					if newMessage.fromUser?.publicKey != newMessage.publicKey {
 						newMessage.fromUser?.keyMatch = false
 						newMessage.fromUser?.newPublicKey = newMessage.publicKey
 						let nodeKey = String(newMessage.fromUser?.publicKey?.base64EncodedString() ?? "No Key").prefix(8)
-						let messageKey = String(newMessage.fromUser?.newPublicKey?.base64EncodedString() ?? "No Key").prefix(8)
+						let messageKey = String(newMessage.publicKey?.base64EncodedString() ?? "No Key").prefix(8)
 						Logger.data.error("🔑 Key Mismatch origninal key: \(nodeKey, privacy: .public) . . . new key: \(messageKey, privacy: .public) . . .")
 					}
 				} else if packet.pkiEncrypted {
@@ -902,17 +898,14 @@ func textMessageAppPacket(
 						newMessage.fromUser?.publicKey = packet.publicKey
 					}
 				}
-				
 				if packet.rxTime > 0 {
 					newMessage.fromUser?.userNode?.lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
 				} else {
 					newMessage.fromUser?.userNode?.lastHeard = Date()
 				}
 			}
-			
 			newMessage.messagePayload = messageText
 			newMessage.messagePayloadMarkdown = generateMessageMarkdown(message: messageText!)
-			
 			if packet.to != Constants.maximumNodeNum && newMessage.fromUser != nil {
 				newMessage.fromUser?.lastMessage = Date()
 			}