diff --git a/css/glowingbear.css b/css/glowingbear.css
index bee10d0..65a89b8 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -926,3 +926,7 @@ img.emojione {
 [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
   display: none !important;
 }
+
+code {
+    padding: 0px 2px;
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 17d51a0..92c7594 100644
--- a/index.html
+++ b/index.html
@@ -336,7 +336,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
               <td class="prefix"><span ng-class="::{'repeated-prefix': bufferline.prefixtext==bufferlines[$index-1].prefixtext}"><a ng-click="addMention(bufferline)"><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&gt;</span></a></span></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 | conditionalLinkify:part.classes.includes('cof-chat_host') | 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 | conditionalLinkify:part.classes.includes('cof-chat_host') | codify | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' |  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 272f61a..9e5db35 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -237,4 +237,14 @@ weechat.filter('prefixlimit', function() {
     };
 });
 
+weechat.filter('codify', function() {
+    return function(text) {
+        var re = /(`.+?`)/g;
+        return text.replace(re, function(z) {
+            var rr = '<code>' + z.slice(1, z.length-1) + '</code>';
+            return rr;
+        });
+    };
+});
+
 })();
diff --git a/test/unit/filters.js b/test/unit/filters.js
index 2b1358f..74c402d 100644
--- a/test/unit/filters.js
+++ b/test/unit/filters.js
@@ -92,4 +92,28 @@ describe('Filters', function() {
             // I.e. if we ever got this far, the bug is fixed.
         }));
     });
+
+    describe('codify', function() {
+        it('should not mess up text', inject(function(codifyFilter) {
+            expect(codifyFilter('foo')).toEqual('foo');
+        }));
+
+        it('should codify single snippets', inject(function(codifyFilter) {
+            expect(codifyFilter('z `foo` z')).toEqual('z <code>foo</code> z');
+        }));
+
+        it('should codify multiple snippets', inject(function(codifyFilter) {
+            expect(codifyFilter('z `foo` z `bar` `baz`')).toEqual('z <code>foo</code> z <code>bar</code> <code>baz</code>');
+        }));
+
+        it('should not codify empty snippets', inject(function(codifyFilter) {
+            expect(codifyFilter('``')).toEqual('``');
+        }));
+
+        it('should not codify single backticks', inject(function(codifyFilter) {
+            expect(codifyFilter('foo`bar')).toEqual('foo`bar');
+        }));
+
+        
+    });
 });