diff --git a/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte b/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte
index 1c74f395..8d7d2e9b 100644
--- a/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte
+++ b/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte
@@ -74,6 +74,11 @@
 		</div>
 
 		<div class={cn(`max-w-[50%] ${isHeadNeeded ? 'mt-4' : 'mt-0'}`)}>
+			{#if isHeadNeeded && !isOwn && sender}
+				<p class="text-black-400 mb-1 px-1 text-xs font-medium">
+					{sender.name}
+				</p>
+			{/if}
 			<div
 				class={cn(
 					`relative rounded-3xl px-4 py-2 ${isOwn ? 'bg-grey' : 'bg-brand-burnt-orange'}`
diff --git a/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte
index 2a3efc20..3db8438d 100644
--- a/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/group/[id]/+page.svelte
@@ -42,14 +42,20 @@
 			isOwn: false,
 			userImgSrc: 'https://i.pravatar.cc/150?img=2',
 			time: '2 minutes ago',
-			message: 'Hey everyone, can we finalize the color palette today?'
+			message: 'Hey everyone, can we finalize the color palette today?',
+			senderId: 'user-2',
+			senderName: 'Bob',
+			senderHandle: '@bob'
 		},
 		{
 			id: 'msg-2',
 			isOwn: true,
 			userImgSrc: 'https://i.pravatar.cc/150?img=1',
 			time: '1 minute ago',
-			message: 'Yes, I just pushed a new draft to Figma.'
+			message: 'Yes, I just pushed a new draft to Figma.',
+			senderId: 'user-1',
+			senderName: 'Alice',
+			senderHandle: '@alice'
 		}
 	]);
 
@@ -65,14 +71,18 @@
 
 	async function handleSend() {
 		if (!messageValue.trim()) return Promise.resolve();
+		const currentMember = group.members.find((m) => m.id === userId);
 		messages = [
 			...messages,
 			{
 				id: `msg-${Date.now()}`,
 				isOwn: true,
-				userImgSrc: group.members.find((m) => m.id === userId)?.avatar || '',
+				userImgSrc: currentMember?.avatar || '',
 				time: 'just now',
-				message: messageValue
+				message: messageValue,
+				senderId: userId,
+				senderName: currentMember?.name || '',
+				senderHandle: `@${currentMember?.name.toLowerCase() || ''}`
 			}
 		];
 		messageValue = '';
@@ -141,12 +151,32 @@
 
 <section class="chat relative px-0">
 	<div class="mt-4 h-[calc(100vh-300px)] overflow-auto" bind:this={messagesContainer}>
-		{#each messages as msg (msg.id)}
+		{#each messages as msg, index (msg.id)}
+			{@const prevMessage = index > 0 ? messages[index - 1] : null}
+			{@const nextMessage = index < messages.length - 1 ? messages[index + 1] : null}
+			{@const isHeadNeeded = Boolean(
+				!prevMessage ||
+					prevMessage.isOwn !== msg.isOwn ||
+					(prevMessage.senderId && msg.senderId && prevMessage.senderId !== msg.senderId)
+			)}
+			{@const isTimestampNeeded = Boolean(
+				!nextMessage ||
+					nextMessage.isOwn !== msg.isOwn ||
+					(nextMessage.senderId && msg.senderId && nextMessage.senderId !== msg.senderId)
+			)}
 			<ChatMessage
 				isOwn={msg.isOwn}
 				userImgSrc={msg.userImgSrc}
 				time={msg.time}
 				message={msg.message}
+				{isHeadNeeded}
+				{isTimestampNeeded}
+				sender={{
+					id: msg.senderId,
+					name: msg.senderName,
+					handle: msg.senderHandle,
+					avatarUrl: msg.userImgSrc
+				}}
 			/>
 		{/each}
 	</div>
diff --git a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
index 7a250635..3f5ab975 100644
--- a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
@@ -122,10 +122,18 @@
 			const nextMessage = index < newMessages.length - 1 ? newMessages[index + 1] : null;
 
 			// Show head (avatar, pointer) on first message of group
-			const isHeadNeeded = !prevMessage || prevMessage.isOwn !== msg.isOwn;
+			// Check if isOwn changed OR if the sender changed (for non-own messages)
+			const isHeadNeeded =
+				!prevMessage ||
+				prevMessage.isOwn !== msg.isOwn ||
+				(prevMessage.senderId && msg.senderId && prevMessage.senderId !== msg.senderId);
 
 			// Show timestamp on last message of group
-			const isTimestampNeeded = !nextMessage || nextMessage.isOwn !== msg.isOwn;
+			// Check if isOwn will change OR if the sender will change (for non-own messages)
+			const isTimestampNeeded =
+				!nextMessage ||
+				nextMessage.isOwn !== msg.isOwn ||
+				(nextMessage.senderId && msg.senderId && nextMessage.senderId !== msg.senderId);
 
 			return {
 				...msg,