diff --git a/CHANGES.md b/CHANGES.md
index 3d9ce4547e..2b2129343d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features:
  -
 
 Improvements:
- -
+ - Handle click on redacted events: view source and create permalink
 
 Other changes:
  -
diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
index c82631c0b2..db171300e6 100644
--- a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
+++ b/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt
@@ -21,5 +21,5 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 
 fun TimelineEvent.canReact(): Boolean {
     // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
-    return root.getClearType() == EventType.MESSAGE && sendState.isSent()
+    return root.getClearType() == EventType.MESSAGE && sendState.isSent() && !root.isRedacted()
 }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
index 21f5da52fa..b49731d9d4 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt
@@ -126,51 +126,53 @@ class MessageMenuViewModel @AssistedInject constructor(@Assisted initialState: M
                 }
                 //TODO is downloading attachement?
 
-                if (event.canReact()) {
-                    this.add(SimpleAction(ACTION_ADD_REACTION, R.string.message_add_reaction, R.drawable.ic_add_reaction, eventId))
-                }
-                if (canCopy(type)) {
-                    //TODO copy images? html? see ClipBoard
-                    this.add(SimpleAction(ACTION_COPY, R.string.copy, R.drawable.ic_copy, messageContent!!.body))
-                }
-
-                if (canReply(event, messageContent)) {
-                    this.add(SimpleAction(ACTION_REPLY, R.string.reply, R.drawable.ic_reply, eventId))
-                }
-
-                if (canEdit(event, session.sessionParams.credentials.userId)) {
-                    this.add(SimpleAction(ACTION_EDIT, R.string.edit, R.drawable.ic_edit, eventId))
-                }
-
-                if (canRedact(event, session.sessionParams.credentials.userId)) {
-                    this.add(SimpleAction(ACTION_DELETE, R.string.delete, R.drawable.ic_delete, eventId))
-                }
-
-                if (canQuote(event, messageContent)) {
-                    this.add(SimpleAction(ACTION_QUOTE, R.string.quote, R.drawable.ic_quote, eventId))
-                }
-
-                if (canViewReactions(event)) {
-                    this.add(SimpleAction(ACTION_VIEW_REACTIONS, R.string.message_view_reaction, R.drawable.ic_view_reactions, informationData))
-                }
-
-                if (canShare(type)) {
-                    if (messageContent is MessageImageContent) {
-                        this.add(
-                                SimpleAction(ACTION_SHARE,
-                                        R.string.share, R.drawable.ic_share,
-                                        session.contentUrlResolver().resolveFullSize(messageContent.url))
-                        )
+                if (!event.root.isRedacted()) {
+                    if (event.canReact()) {
+                        this.add(SimpleAction(ACTION_ADD_REACTION, R.string.message_add_reaction, R.drawable.ic_add_reaction, eventId))
+                    }
+                    if (canCopy(type)) {
+                        //TODO copy images? html? see ClipBoard
+                        this.add(SimpleAction(ACTION_COPY, R.string.copy, R.drawable.ic_copy, messageContent!!.body))
+                    }
+
+                    if (canReply(event, messageContent)) {
+                        this.add(SimpleAction(ACTION_REPLY, R.string.reply, R.drawable.ic_reply, eventId))
+                    }
+
+                    if (canEdit(event, session.sessionParams.credentials.userId)) {
+                        this.add(SimpleAction(ACTION_EDIT, R.string.edit, R.drawable.ic_edit, eventId))
+                    }
+
+                    if (canRedact(event, session.sessionParams.credentials.userId)) {
+                        this.add(SimpleAction(ACTION_DELETE, R.string.delete, R.drawable.ic_delete, eventId))
+                    }
+
+                    if (canQuote(event, messageContent)) {
+                        this.add(SimpleAction(ACTION_QUOTE, R.string.quote, R.drawable.ic_quote, eventId))
+                    }
+
+                    if (canViewReactions(event)) {
+                        this.add(SimpleAction(ACTION_VIEW_REACTIONS, R.string.message_view_reaction, R.drawable.ic_view_reactions, informationData))
+                    }
+
+                    if (canShare(type)) {
+                        if (messageContent is MessageImageContent) {
+                            this.add(
+                                    SimpleAction(ACTION_SHARE,
+                                            R.string.share, R.drawable.ic_share,
+                                            session.contentUrlResolver().resolveFullSize(messageContent.url))
+                            )
+                        }
+                        //TODO
                     }
-                    //TODO
-                }
 
 
-                if (event.sendState == SendState.SENT) {
+                    if (event.sendState == SendState.SENT) {
 
-                    //TODO Can be redacted
+                        //TODO Can be redacted
 
-                    //TODO sent by me or sufficient power level
+                        //TODO sent by me or sufficient power level
+                    }
                 }
 
                 this.add(SimpleAction(VIEW_SOURCE, R.string.view_source, R.drawable.ic_view_source, event.root.toContentStringWithIndent()))
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index d8f1c602d5..3f5c41bf31 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -417,6 +417,14 @@ class MessageItemFactory @Inject constructor(
                 .informationData(informationData)
                 .highlighted(highlight)
                 .avatarCallback(callback)
+                .cellClickListener(
+                        DebouncedClickListener(View.OnClickListener { view ->
+                            callback?.onEventCellClicked(informationData, null, view)
+                        }))
+                .longClickListener { view ->
+                    return@longClickListener callback?.onEventLongClicked(informationData, null, view)
+                            ?: false
+                }
     }
 
     private fun linkifyBody(body: CharSequence, callback: TimelineEventController.Callback?): CharSequence {