diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 1eae487f5a..dd39e7bcd3 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -254,6 +254,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816cc..1d7917bfce 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -7,11 +7,17 @@ export const messageQuery = () => {
         _id
         id
         indexId
-        senderId
         content
+        senderId
         author {
           id
         }
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
       }
     }
   `