diff --git a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
index fe01f6887..a7bfd69f1 100644
--- a/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
+++ b/Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
@@ -623,6 +623,10 @@ NSString *const kMXKRoomBubbleCellKeyVerificationIncomingRequestDeclinePressed =
             selectedComponentHeight = roomBubbleTableViewCell.frame.size.height - selectedComponentPositionY;
         }
         
+        // Force the textView used underneath to layout its frame properly
+        [roomBubbleTableViewCell setNeedsLayout];
+        [roomBubbleTableViewCell layoutIfNeeded];
+        
         selectedComponenContentViewYOffset = roomBubbleTableViewCell.messageTextView.frame.origin.y;
     }
     
diff --git a/changelog.d/pr-7064.bugfix b/changelog.d/pr-7064.bugfix
new file mode 100644
index 000000000..9a50c31d4
--- /dev/null
+++ b/changelog.d/pr-7064.bugfix
@@ -0,0 +1 @@
+Fixed timeline layout issues for reactions and attachments
\ No newline at end of file