diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
index 9a2decc63..61b608910 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
@@ -96,13 +96,13 @@ class BubbleRoomTimelineCellDecorator: PlainRoomTimelineCellDecorator {
     override func addReactionView(_ reactionsView: BubbleReactionsView,
                                   toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData, contentViewPositionY: CGFloat, upperDecorationView: UIView?) {
         
-        cell.addTemporarySubview(reactionsView)
-        
         if let reactionsDisplayable = cell as? BubbleCellReactionsDisplayable {
             reactionsDisplayable.addReactionsView(reactionsView)
             return
         }
         
+        cell.addTemporarySubview(reactionsView)
+        
         reactionsView.translatesAutoresizingMaskIntoConstraints = false
         
         let cellContentView = cell.contentView
@@ -221,11 +221,11 @@ class BubbleRoomTimelineCellDecorator: PlainRoomTimelineCellDecorator {
                               contentViewPositionY: CGFloat,
                               upperDecorationView: UIView?) {
 
-        cell.addTemporarySubview(threadSummaryView)
-
         if let threadSummaryDisplayable = cell as? BubbleCellThreadSummaryDisplayable {
             threadSummaryDisplayable.addThreadSummaryView(threadSummaryView)
         } else {
+            
+            cell.addTemporarySubview(threadSummaryView)
             threadSummaryView.translatesAutoresizingMaskIntoConstraints = false
 
             let cellContentView = cell.contentView