diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
index 64a016459..5a06acef8 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
@@ -363,7 +363,11 @@ class TalkSpecificViewThemeUtils @Inject constructor(
     fun themeMarkdown(context: Context, message: String, incoming: Boolean): Spanned {
         return withScheme(context) { scheme ->
             return@withScheme if (incoming) {
-                MessageUtils(context).getRenderedMarkdownText(context, message, R.color.nc_incoming_text_default)
+                MessageUtils(context).getRenderedMarkdownText(
+                    context,
+                    message,
+                    context.getColor(R.color.nc_incoming_text_default)
+                )
             } else {
                 MessageUtils(context).getRenderedMarkdownText(context, message, scheme.onSurfaceVariant)
             }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
index c386aec64..89b64c55f 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
@@ -71,7 +71,7 @@ class MessageUtils(val context: Context) {
         } else if (message.renderMarkdown == false) {
             SpannableString(message.message)
         } else {
-            enrichChatMessageText(context, message.text, incoming, viewThemeUtils)
+            enrichChatMessageText(context, message.message!!, incoming, viewThemeUtils)
         }
     }