diff --git a/www/support/app-support.less b/www/support/app-support.less
index c033332eb..7684c054e 100644
--- a/www/support/app-support.less
+++ b/www/support/app-support.less
@@ -17,5 +17,13 @@
 
     display: flex;
     flex-flow: column;
+
+    .cp-support-language-list {
+        .cp-support-language {
+            margin-left: 5px;
+            background-color: rgba(0, 0, 0, 0.1);
+            padding: 0 5px;
+        }
+    }
 }
 
diff --git a/www/support/inner.js b/www/support/inner.js
index de1164344..3d907421d 100644
--- a/www/support/inner.js
+++ b/www/support/inner.js
@@ -139,20 +139,20 @@ define([
         if (!Array.isArray(AppConfig.supportLanguages)) { return $(h('div')); }
         var languages = AppConfig.supportLanguages;
 
-        var list = h('li', languages
+        var list = h('span.cp-support-language-list', languages
             .map(function (lang) {
                 return Messages._languages[lang];
             })
             .filter(Boolean)
             .map(function (lang) {
-                return h('li', lang);
+                return h('span.cp-support-language', lang);
             })
         );
 
-        var preamble = "This server's administrators speak the following languages:"; // XXX
+        Messages.support_languagesPreamble = "This server's administrators speak the following languages:"; // XXX
         var $div = $(
             h('div.cp-support-language', [
-                preamble,
+                Messages.support_languagesPreamble,
                 list,
             ])
         );