diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
index 1a09986090..2cd44566e7 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
@@ -534,7 +534,7 @@ - (CGSize)textContentSize:(NSAttributedString*)attributedText removeVerticalInse
     CGFloat horizontalInset = measurementTextView.textContainer.lineFragmentPadding * 2;
     
     CGSize size = [attributedText boundingRectWithSize:CGSizeMake(_maxTextViewWidth - horizontalInset, CGFLOAT_MAX)
-                                               options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading
+                                               options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading | NSStringDrawingUsesDeviceMetrics
                                                context:nil].size;
     
     //In iOS 7 and later, this method returns fractional sizes (in the size component of the returned rectangle);
diff --git a/changelog.d/pr-6702.bugfix b/changelog.d/pr-6702.bugfix
new file mode 100644
index 0000000000..af2b8f1546
--- /dev/null
+++ b/changelog.d/pr-6702.bugfix
@@ -0,0 +1 @@
+Fix timeline items text height calculation
\ No newline at end of file