diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 4e0c71fb65f0f1dca6a29e30b8f20978c47bd140..825065ed2aabac1fba6ef038e06d8435d7a92eee 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -112,7 +112,11 @@
     if (!severity) severity = "error";
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
+    if (typeof ann.messageHTML != 'undefined') {
+        tip.innerHTML = ann.messageHTML;
+    } else {
+        tip.appendChild(document.createTextNode(ann.message));
+    }
     return tip;
   }