diff --git a/css/glowingbear.css b/css/glowingbear.css
index fd021fa..3478ef3 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -636,6 +636,10 @@ img.emojione {
     width: auto;
 }
 
+.comicsans {
+   font-family: 'Comic Sans MS', 'Comic Neue', sans-serif;
+}
+
 .glyphicon-spin {
   -webkit-animation: spin 1000ms infinite linear;
   animation: spin 1000ms infinite linear;
diff --git a/index.html b/index.html
index 11b6eb5..877b00e 100644
--- a/index.html
+++ b/index.html
@@ -296,7 +296,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span class="hidden-bracket">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket">&gt;</span></a></td><!--
            --><td class="message"><!--
              --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
-             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' | DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' | DOMfilter:'comicsansify' | DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
diff --git a/js/filters.js b/js/filters.js
index 37ff9b9..0aa085b 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -210,4 +210,15 @@ weechat.filter('prefixlimit', function() {
     };
 });
 
+// Messages mentioning Comic Sans should be set in it
+weechat.filter('comicsansify', function() {
+    return function(text) {
+        if (/comic sans/gmi.test(text)) {
+            return '<span class="comicsans">' + text + '</span>';
+        } else {
+            return text;
+        }
+    };
+});
+
 })();