diff --git a/Meshtastic/Views/Messages/MessageText.swift b/Meshtastic/Views/Messages/MessageText.swift
index 0cdd4be8..57adc99c 100644
--- a/Meshtastic/Views/Messages/MessageText.swift
+++ b/Meshtastic/Views/Messages/MessageText.swift
@@ -24,11 +24,25 @@ struct MessageText: View {
 		let markdownText = LocalizedStringKey(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE"))
 		return Text(markdownText)
 			.tint(Self.linkBlue)
-			.padding(10)
+			.padding(.vertical, 10)
+			.padding(.horizontal, 8)
 			.foregroundColor(.white)
 			.background(isCurrentUser ? .accentColor : Color(.gray))
 			.cornerRadius(15)
 			.overlay {
+				if message.pkiEncrypted {
+					VStack (alignment: .trailing) {
+						Spacer()
+						HStack {
+							Spacer()
+							Image(systemName: "lock.circle.fill")
+								.symbolRenderingMode(.palette)
+								.foregroundStyle(.white, .green)
+								.font(.system(size: 20))
+								.offset(x: 8, y: 8)
+						}
+					}
+				}
 				let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
 				if tapBackDestination.overlaySensorMessage {
 					VStack {
diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift
index 977c1686..b0ec3a10 100644
--- a/Meshtastic/Views/Messages/UserMessageList.swift
+++ b/Meshtastic/Views/Messages/UserMessageList.swift
@@ -57,12 +57,6 @@ struct UserMessageList: View {
 												self.replyMessageId = message.messageId
 												self.messageFieldFocused = true
 											}
-											if message.pkiEncrypted {
-												Image(systemName: "lock.circle.fill")
-													.foregroundStyle(.green)
-													.frame(height: 25)
-													.padding(.top, 5)
-											}
 
 											if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
 												RetryButton(message: message, destination: .user(user))