diff --git a/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
index 44cb2cc60..a793fb176 100644
--- a/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
@@ -242,7 +242,7 @@ struct Settings_Previews: PreviewProvider {
                                           mediaProvider: MockMediaProvider())
         let viewModel = SettingsViewModel(withUserSession: userSession)
 
-        return NavigationView {
+        NavigationView {
             SettingsScreen(context: viewModel.context)
                 .previewInterfaceOrientation(.portrait)
         }
diff --git a/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift
index 14495061d..1215c8d5a 100644
--- a/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimeLineItemContent/MessageTimelineItem.swift
@@ -82,7 +82,7 @@ extension MatrixRustSDK.NoticeMessageContent: FormattedMessageContentProtocol {
 /// the `msgtype` would likely contain a formatted body.
 extension MessageTimelineItem where Content: FormattedMessageContentProtocol {
     var htmlBody: String? {
-        #warning("Should this check the formatted type?")
+        guard content.formatted?.format == .html else { return nil }
         return content.formatted?.body
     }
 }
diff --git a/codecov.yml b/codecov.yml
index c95ff93a6..f033b78f9 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -6,14 +6,7 @@ coverage:
         # project coverage decrease by more than 1%:
         target: auto
         threshold: 1%
-    patch:
-      default:
-        # Be tolerant on slight code coverage diff on PRs to limit
-        # noisy red coverage status on github PRs.
-        # Note: The coverage stats are still uploaded
-        # to codecov so that PR reviewers can see uncovered lines
-        target: auto
-        threshold: 1%
+    patch: false
 
 ignore:
   - "ElementX/Source/Generated"  # ignore the folder and all its contents
\ No newline at end of file