diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
index 609ab5c3b3..a3452d4422 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
@@ -181,7 +181,7 @@ class ActionListPresenter @Inject constructor(
                             add(TimelineItemAction.Forward)
                         }
                     }
-                    if (timelineItem.isMine && timelineItem.isTextMessage) {
+                    if (timelineItem.isEditable) {
                         add(TimelineItemAction.Edit)
                     }
                     if (timelineItem.content.canBeCopied()) {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index e9b2265e76..593b41deea 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -326,9 +326,7 @@ class RustTimeline(
                         specialModeEventTimelineItem = null
                     }
                     transactionId != null -> {
-                        inner.getEventTimelineItemByTransactionId(transactionId.value).use {
-                            inner.redactEvent(item = it, reason = null)
-                        }
+                        error("Editing local echo is not supported yet.")
                     }
                     else -> {
                         error("Either originalEventId or transactionId must be non null")