diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index e57841e37e..e4190ff033 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -3260,7 +3260,7 @@
 			repositoryURL = "https://git.shadowfacts.net/shadowfacts/HTMLStreamer.git";
 			requirement = {
 				kind = exactVersion;
-				version = 0.2.5;
+				version = 0.3.0;
 			};
 		};
 		D63CC700290EC0B8000E19DE /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
diff --git a/Tusker/HTMLConverter.swift b/Tusker/HTMLConverter.swift
index 8dcad65891..26dd6ccf8c 100644
--- a/Tusker/HTMLConverter.swift
+++ b/Tusker/HTMLConverter.swift
@@ -25,8 +25,14 @@ class HTMLConverter {
     
     private let converter: AttributedStringConverter<Callbacks>
     
-    init(font: UIFont, monospaceFont: UIFont, color: UIColor, paragraphStyle: NSParagraphStyle) {
-        let config = AttributedStringConverterConfiguration(font: font, monospaceFont: monospaceFont, color: color, paragraphStyle: paragraphStyle)
+    init(font: UIFont, monospaceFont: UIFont, fontMetrics: UIFontMetrics, color: UIColor, paragraphStyle: NSParagraphStyle) {
+        let config = AttributedStringConverterConfiguration(
+            font: font,
+            monospaceFont: monospaceFont,
+            fontMetrics: fontMetrics,
+            color: color,
+            paragraphStyle: paragraphStyle
+        )
         self.converter = AttributedStringConverter(configuration: config)
     }
    
diff --git a/Tusker/Screens/Report/ReportStatusView.swift b/Tusker/Screens/Report/ReportStatusView.swift
index 036ed91c62..57d1da82b0 100644
--- a/Tusker/Screens/Report/ReportStatusView.swift
+++ b/Tusker/Screens/Report/ReportStatusView.swift
@@ -12,6 +12,7 @@ import SwiftUI
 private var converter = HTMLConverter(
     font: .preferredFont(forTextStyle: .body),
     monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
+    fontMetrics: .default,
     color: .label,
     paragraphStyle: .default
 )
diff --git a/Tusker/Views/ConfirmReblogStatusPreviewView.swift b/Tusker/Views/ConfirmReblogStatusPreviewView.swift
index 2ac6a3c20a..96a44c7c05 100644
--- a/Tusker/Views/ConfirmReblogStatusPreviewView.swift
+++ b/Tusker/Views/ConfirmReblogStatusPreviewView.swift
@@ -13,6 +13,7 @@ class ConfirmReblogStatusPreviewView: UIView {
     private static let htmlConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .caption2),
         monospaceFont: UIFontMetrics(forTextStyle: .caption2).scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
+        fontMetrics: UIFontMetrics(forTextStyle: .caption2),
         color: .label,
         paragraphStyle: .default
     )
diff --git a/Tusker/Views/ContentTextView.swift b/Tusker/Views/ContentTextView.swift
index edf1c04e91..f6fc07fc3d 100644
--- a/Tusker/Views/ContentTextView.swift
+++ b/Tusker/Views/ContentTextView.swift
@@ -25,6 +25,7 @@ class ContentTextView: LinkTextView, BaseEmojiLabel {
     private static let defaultBodyHTMLConverter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
+        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )
diff --git a/Tusker/Views/Profile Header/ProfileFieldValueView.swift b/Tusker/Views/Profile Header/ProfileFieldValueView.swift
index e15a628579..cfac804b38 100644
--- a/Tusker/Views/Profile Header/ProfileFieldValueView.swift	
+++ b/Tusker/Views/Profile Header/ProfileFieldValueView.swift	
@@ -21,6 +21,7 @@ class ProfileFieldValueView: UIView {
     private static let converter = HTMLConverter(
         font: .preferredFont(forTextStyle: .body),
         monospaceFont: UIFontMetrics.default.scaledFont(for: .monospacedSystemFont(ofSize: 17, weight: .regular)),
+        fontMetrics: .default,
         color: .label,
         paragraphStyle: .default
     )
diff --git a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
index 8ed333be03..a3cc2ee427 100644
--- a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
+++ b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
@@ -20,6 +20,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
     private static let htmlConverter = HTMLConverter(
         font: ConversationMainStatusCollectionViewCell.contentFont,
         monospaceFont: ConversationMainStatusCollectionViewCell.monospaceFont,
+        fontMetrics: .default,
         color: .label,
         paragraphStyle: ConversationMainStatusCollectionViewCell.contentParagraphStyle
     )
diff --git a/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift b/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift
index 3d32d93165..2e75d7a64f 100644
--- a/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift
+++ b/Tusker/Views/Status/TimelineStatusCollectionViewCell.swift
@@ -23,6 +23,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
     static let htmlConverter = HTMLConverter(
         font: TimelineStatusCollectionViewCell.contentFont,
         monospaceFont: TimelineStatusCollectionViewCell.monospaceFont,
+        fontMetrics: .default,
         color: .label,
         paragraphStyle: TimelineStatusCollectionViewCell.contentParagraphStyle
     )