2 files changed, 10 insertions, 2 deletions
diff --git a/src/main/assets/scripts.js b/src/main/assets/scripts.js
index 95ca913d..13f0cb75 100644
--- a/src/main/assets/scripts.js
+++ b/src/main/assets/scripts.js
@@ -524,6 +524,9 @@ function fetchUserUri(dataUri, callback) {
             .then(json => {
                 users[dataUri] = json;
                 callback(json);
+            })
+            .catch(e => {
+                callback({ preferredUsername: dataUri });
             });
     }
 }
@@ -731,7 +734,7 @@ ready(() => {
                         }
                         let textNode = a.childNodes[0];
                         if (textNode && textNode.nodeType === Node.TEXT_NODE && textNode.nodeValue && textNode.nodeValue.trim().length > 0) {
-                            let uname = document.createTextNode(user.preferredUsername);
+                            let uname = document.createTextNode(user.preferredUsername || dataUri);
                             if (a.firstChild) {
                                 a.replaceChild(uname, a.firstChild);
                             }
diff --git a/src/main/assets/style.css b/src/main/assets/style.css
index 28293164..9b5d7615 100644
--- a/src/main/assets/style.css
+++ b/src/main/assets/style.css
@@ -658,9 +658,14 @@ blockquote {
     flex-wrap: wrap;
 }
 .users > span {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
     overflow: hidden;
     padding: 6px 0;
-    width: 200px;
+    width: 220px;
 }
 .users img {
     height: 32px;