diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index 34c7d559b..e042fc600 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -6,6 +6,10 @@ export const createMessageMutation = () => {
       CreateMessage(roomId: $roomId, content: $content) {
         id
         content
+        senderId
+        username
+        avatar
+        date
         saved
         distributed
         seen
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index 5b0e4d7e2..c28d6a70d 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -11,6 +11,13 @@ const setRoomProps = (room) => {
   }
 }
 
+const setMessageProps = (message, context) => {
+  message._id = message.id
+  if (message.senderId !== context.user.id) {
+    message.distributed = true
+  }
+}
+
 const roomProperties = async (resolve, root, args, context, info) => {
   const resolved = await resolve(root, args, context, info)
   if (resolved) {
@@ -25,9 +32,24 @@ const roomProperties = async (resolve, root, args, context, info) => {
   return resolved
 }
 
+const messageProperties = async (resolve, root, args, context, info) => {
+  const resolved = await resolve(root, args, context, info)
+  if (resolved) {
+    if (isArray(resolved)) {
+      resolved.forEach((message) => {
+        setMessageProps(message, context)
+      })
+    } else {
+      setMessageProps(resolved, context)
+    }
+  }
+  return resolved
+}
+
 export default {
   Query: {
     Room: roomProperties,
+    Message: messageProperties,
   },
   Mutation: {
     CreateRoom: roomProperties,
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 9a9e84c1e..68b84ad69 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -125,6 +125,10 @@ describe('Message', () => {
                 CreateMessage: {
                   id: expect.any(String),
                   content: 'Some nice message to other chatting user',
+                  senderId: 'chatting-user',
+                  username: 'Chatting User',
+                  avatar: expect.any(String),
+                  date: expect.any(String),
                   saved: true,
                   distributed: false,
                   seen: false,
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 266758128..fa80a7b3f 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -40,12 +40,6 @@ export default {
           }
           // send subscription to author to updated the messages
         }
-        resolved.forEach((message) => {
-          message._id = message.id
-          if (message.senderId !== context.user.id) {
-            message.distributed = true
-          }
-        })
       }
       return resolved
     },
@@ -60,6 +54,7 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -69,7 +64,13 @@ export default {
             seen: false
           })-[:INSIDE]->(room)
           SET room.lastMessageAt = toString(datetime())
-          RETURN message { .* }
+          RETURN message {
+            .*,
+            senderId: currentUser.id,
+            username: currentUser.name,
+            avatar: image.url,
+            date: message.createdAt
+          }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,