diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
index 37bcee15a..57a74dacb 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
@@ -43,4 +43,19 @@ class BubbleRoomTimelineStyle: RoomTimelineStyle {
         return false
     }
     
+    func applySelectedStyleIfNeeded(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData) {
+        
+        // Check whether the selected event belongs to this bubble
+        let selectedComponentIndex = cellData.selectedComponentIndex
+        if selectedComponentIndex != NSNotFound {
+            
+            cell.selectComponent(UInt(selectedComponentIndex),
+                                 showEditButton: false,
+                                 showTimestamp: false)
+            
+            self.cellDecorator.addTimestampLabel(toCell: cell, cellData: cellData)
+        } else {
+            cell.blurred = true
+        }
+    }
 }
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellDecorator.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellDecorator.swift
index 4e8a09e31..89a665fe8 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellDecorator.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellDecorator.swift
@@ -23,6 +23,8 @@ protocol RoomTimelineCellDecorator {
     func addTimestampLabelIfNeeded(toCell cell: MXKRoomBubbleTableViewCell,
                                    cellData: RoomBubbleCellData)
     
+    func addTimestampLabel(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData)
+    
     func addURLPreviewView(_ urlPreviewView: URLPreviewView,
                            toCell cell: MXKRoomBubbleTableViewCell,
                            cellData: RoomBubbleCellData,