diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
index 39668b05ba..4017597e0e 100644
--- a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
+++ b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
@@ -303,6 +303,7 @@ Control {
                                 visible: active
                                 sourceComponent: StatusTextMessage {
                                     messageDetails: root.messageDetails
+                                    isEdited: root.isEdited
                                     allowShowMore: !root.isInPinnedPopup
                                     textField.anchors.rightMargin: root.isInPinnedPopup ? /*Style.current.xlPadding*/ 32 : 0 // margin for the "Unpin" floating button
                                     highlightedLink: root.highlightedLink
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 9519721541..3b5975dd50 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -114,6 +114,7 @@ Loader {
     property double nextMessageTimestamp: nextMessageAsJsonObj ? nextMessageAsJsonObj.timestamp : 0
     property var nextMessageAsJsonObj
 
+    readonly property bool editRestricted: root.isSticker
     property bool editModeOn: false
     property bool isEdited: false
 
@@ -178,7 +179,7 @@ Loader {
             messageContentType: root.messageContentType,
             pinnedMessage: root.pinnedMessage,
             canPin: !!root.messageStore && root.messageStore.getNumberOfPinnedMessages() < Constants.maxNumberOfPins,
-            editRestricted: root.isSticker || root.isImage,
+            editRestricted: root.editRestricted,
         }
 
         Global.openMenu(messageContextMenuComponent, this, params)
@@ -946,7 +947,7 @@ Loader {
                         }
                     },
                     Loader {
-                        active: !root.isInPinnedPopup && root.isText && !root.editModeOn && root.amISender && delegate.hovered && !delegate.hideQuickActions
+                        active: !root.isInPinnedPopup && !root.editRestricted && !root.editModeOn && root.amISender && delegate.hovered && !delegate.hideQuickActions
                                 && !root.isViewMemberMessagesePopup && root.rootStore.permissionsStore.viewAndPostCriteriaMet
                         visible: active
                         sourceComponent: StatusFlatRoundButton {