diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index 9650f2ca..58f780d0 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -21,21 +21,6 @@
     },
     ": %d" : {
 
-    },
-    ".dot" : {
-
-    },
-    ".gauge" : {
-
-    },
-    ".gradient" : {
-
-    },
-    ".pill" : {
-
-    },
-    ".text" : {
-
     },
     "(Re)define PIN_GPS_EN for your board." : {
 
@@ -19139,6 +19124,9 @@
     },
     "Send" : {
 
+    },
+    "Send ${messageContent} to ${channelNumber}" : {
+
     },
     "Send a Group Message" : {
 
diff --git a/Meshtastic/Views/Messages/MessageText.swift b/Meshtastic/Views/Messages/MessageText.swift
index 1f2cc017..411511fd 100644
--- a/Meshtastic/Views/Messages/MessageText.swift
+++ b/Meshtastic/Views/Messages/MessageText.swift
@@ -30,7 +30,8 @@ struct MessageText: View {
 			.background(isCurrentUser ? .accentColor : Color(.gray))
 			.cornerRadius(15)
 			.overlay {
-				if message.pkiEncrypted && message.ackError == 0 && message.realACK {
+				/// Show the lock if the message is pki encrypted and has a real ack if sent by the current user, or is pki encrypted for incoming messages
+				if message.pkiEncrypted && message.realACK || !isCurrentUser && message.pkiEncrypted {
 					VStack(alignment: .trailing) {
 						Spacer()
 						HStack {