diff --git a/src/components/Name.vue b/src/components/Name.vue
index 946a6d4..6bd3f79 100644
--- a/src/components/Name.vue
+++ b/src/components/Name.vue
@@ -1,18 +1,20 @@
 <template>
-  <span
-    v-if="$store.getters.hasName(pubkey)"
-    class="cursor-pointer font-bold text-secondary mr-2"
-    @click="toProfile(pubkey)"
-  >
-    {{ $store.getters.displayName(pubkey) }}
-  </span>
-  <q-icon
-    v-if="$store.getters.isVerifiedNIP05(pubkey)"
-    name="verified"
-    color="accent"
-    class="cursor-pointer mr-1 -ml-1"
-    @click="openNIP05"
-  />
+  <div class="inline-flex items-center">
+    <span
+      v-if="fallback || $store.getters.hasName(pubkey)"
+      class="cursor-pointer font-bold text-secondary mr-2"
+      @click="toProfile(pubkey)"
+    >
+      {{ $store.getters.displayName(pubkey) }}
+    </span>
+    <q-icon
+      v-if="$store.getters.isVerifiedNIP05(pubkey)"
+      name="verified"
+      color="accent"
+      class="cursor-pointer mr-1 -ml-1"
+      @click="openNIP05"
+    />
+  </div>
 </template>
 
 <script>
@@ -21,7 +23,8 @@ import helpersMixin from '../utils/mixin'
 export default {
   mixins: [helpersMixin],
   props: {
-    pubkey: {type: String, required: true}
+    pubkey: {type: String, required: true},
+    fallback: {type: Boolean, default: false} // if the shortened pubkey should be displayed
   },
   methods: {
     openNIP05() {
diff --git a/src/pages/Chats.vue b/src/pages/Chats.vue
index 10ef7d2..61ac592 100644
--- a/src/pages/Chats.vue
+++ b/src/pages/Chats.vue
@@ -25,7 +25,7 @@
           </q-badge>
         </q-item-section>
         <q-item-section>
-          {{ $store.getters.displayName(chat.peer) }}
+          <Name :pubkey="chat.peer" fallback />
         </q-item-section>
         <q-item-section side>
           {{ niceDate(chat.lastMessage) }}
diff --git a/src/pages/Messages.vue b/src/pages/Messages.vue
index cfb578a..7be7d84 100644
--- a/src/pages/Messages.vue
+++ b/src/pages/Messages.vue
@@ -6,7 +6,7 @@
         class="text-secondary cursor-pointer"
         @click="toProfile($route.params.pubkey)"
       >
-        {{ $store.getters.displayName($route.params.pubkey) }}
+        <Name :pubkey="$route.params.pubkey" fallback />
       </span>
     </div>