diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Views/TextRoomTimelineView.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Views/TextRoomTimelineView.swift
index 3f6f072ad..3de975973 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Views/TextRoomTimelineView.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Views/TextRoomTimelineView.swift
@@ -15,12 +15,16 @@ struct TextRoomTimelineView: View {
     var body: some View {
         VStack(alignment: .leading) {
             EventBasedTimelineView(timelineItem: timelineItem)
-            Text(timelineItem.text)
-                .fixedSize(horizontal: false, vertical: true)
+            if let attributedString = try? AttributedString(markdown: timelineItem.text) {
+                Text(attributedString)
+                    .fixedSize(horizontal: false, vertical: true)
+            } else {
+                Text(timelineItem.text)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
         }
         .id(timelineItem.id)
     }
-
 }
 
 struct TextRoomTimelineView_Previews: PreviewProvider {