diff --git a/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineStyle.swift b/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
index 137338e57..9f5015a00 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
@@ -49,6 +49,10 @@ class BubbleRoomTimelineStyle: RoomTimelineStyle {
     func canAddEvent(_ event: MXEvent, and roomState: MXRoomState, to cellData: MXKRoomBubbleCellData) -> Bool {
         return false
     }
+
+    func canMerge(cellData: MXKRoomBubbleCellDataStoring, into receiverCellData: MXKRoomBubbleCellDataStoring) -> Bool {
+        return false
+    }
     
     func applySelectedStyleIfNeeded(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData) {
         
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineStyle.swift b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineStyle.swift
index e72ce51fb..a37e7f3f8 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineStyle.swift
@@ -49,6 +49,10 @@ class PlainRoomTimelineStyle: RoomTimelineStyle {
     func canAddEvent(_ event: MXEvent, and roomState: MXRoomState, to cellData: MXKRoomBubbleCellData) -> Bool {
         return true
     }
+
+    func canMerge(cellData: MXKRoomBubbleCellDataStoring, into receiverCellData: MXKRoomBubbleCellDataStoring) -> Bool {
+        return true
+    }
     
     func applySelectedStyleIfNeeded(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData) {
         
diff --git a/Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyle.swift b/Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyle.swift
index b430171b5..ef5cf3d4c 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyle.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyle.swift
@@ -39,7 +39,10 @@ protocol RoomTimelineStyle: Themable {
     
     /// Indicate to merge or not event in timeline
     func canAddEvent(_ event: MXEvent, and roomState: MXRoomState, to cellData: MXKRoomBubbleCellData) -> Bool
-    
+
+    /// Indicate to merge or not the `cellData` into `receiverCellData`
+    func canMerge(cellData: MXKRoomBubbleCellDataStoring, into receiverCellData: MXKRoomBubbleCellDataStoring) -> Bool
+
     /// Apply selected or blurred style on cell
     func applySelectedStyleIfNeeded(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData)
 }