diff --git a/src/app/mainview/components/ChatViewFooter.qml b/src/app/mainview/components/ChatViewFooter.qml
index 9ab6cd28..ba754ba6 100644
--- a/src/app/mainview/components/ChatViewFooter.qml
+++ b/src/app/mainview/components/ChatViewFooter.qml
@@ -83,8 +83,12 @@ Rectangle {
         }
 
         function onEditIdChanged() {
-            if (MessagesAdapter.editId.length > 0)
+            if (MessagesAdapter.editId.length > 0) {
+                var editedMessageBody = MessagesAdapter.dataForInteraction(MessagesAdapter.editId, MessageList.Body)
+                messageBar.textAreaObj.insertText(editedMessageBody)
                 messageBar.textAreaObj.forceActiveFocus()
+
+            }
         }
 
         function onReplyToIdChanged() {