diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 1f3f1dc14f09e9f2bd5a561e77684a360170e1ce..1d8b78aa53455ead5208fc75249494a344188a6c 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -1119,7 +1119,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
             spannableBody.setSpan(PLAIN_TEXT_SPAN, 0, spannableBody.length(), 0); // Let adapter know it can do more formatting
         } else {
             SpannableStringBuilder spannable = new SpannableStringBuilder(Html.fromHtml(
-                MessageUtils.filterLtrRtl(html.toString()).trim(),
+                MessageUtils.filterLtrRtl(html.toString().replace("<code>", "<tt>").replace("</code>", "</tt>")).trim(),
                 Html.FROM_HTML_MODE_COMPACT,
                 (source) -> {
                    try {