diff --git a/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusEditMessage.qml b/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusEditMessage.qml
index 92ab504f0a..f0b38fe7ef 100644
--- a/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusEditMessage.qml
+++ b/ui/StatusQ/src/StatusQ/Components/private/statusMessage/StatusEditMessage.qml
@@ -59,7 +59,15 @@ Item {
                 size: StatusBaseButton.Size.Small
                 enabled: !!chatInputLoader.item && chatInputLoader.item.messageText.trim().length > 0
                 onClicked: {
-                    editCompleted(!chatInputLoader.item ? "" : chatInputLoader.item.messageText)
+                    let text = ""
+                    if (chatInputLoader.item) {
+                        if (chatInputLoader.item.getTextWithPublicKeys) {
+                            text = chatInputLoader.item.getTextWithPublicKeys()
+                        } else {
+                            text = chatInputLoader.item.messageText
+                        }
+                    }
+                    editCompleted(text)
                 }
             }
         }
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 74571adef5..05217e192c 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -479,9 +479,7 @@ Loader {
                     delegate.editCancelledHandler()
                 }
 
-                onEditCompleted: {
-                    delegate.editCompletedHandler(newMsgText)
-                }
+                onEditCompleted: delegate.editCompletedHandler(newMsgText)
 
                 onImageClicked: {
                     switch (mouse.button) {
@@ -679,9 +677,7 @@ Loader {
                         chatType: root.messageStore.chatType
                         isEdit: true
 
-                        onSendMessage: {
-                            delegate.editCompletedHandler(editTextInput.textInput.text)
-                        }
+                        onSendMessage: delegate.editCompletedHandler(editTextInput.getTextWithPublicKeys())
 
                         Component.onCompleted: {
                             parseMessage(root.messageText);