diff --git a/platforms/blabsy/src/components/chat/chat-list.tsx b/platforms/blabsy/src/components/chat/chat-list.tsx
index 8ea1784c..bb377775 100644
--- a/platforms/blabsy/src/components/chat/chat-list.tsx
+++ b/platforms/blabsy/src/components/chat/chat-list.tsx
@@ -106,8 +106,8 @@ export function ChatList(): JSX.Element {
                             onClick={() => setCurrentChat(chat)}
                             className={`flex items-center gap-3 rounded-lg p-3 transition-colors ${
                                 currentChat?.id === chat.id
-                                    ? 'bg-primary text-white'
-                                    : 'hover:bg-gray-100 dark:hover:bg-gray-800'
+                                    ? 'bg-gray-200 dark:bg-gray-700 border-l-4 border-primary'
+                                    : 'hover:bg-gray-50 dark:hover:bg-gray-800'
                             }`}
                         >
                             <div className='relative flex h-10 w-10 items-center justify-center overflow-hidden rounded-full bg-gray-200 dark:bg-gray-700'>
@@ -193,8 +193,8 @@ function ChatListItem({
     return (
         <button
             type='button'
-            className={`flex w-full items-center gap-3 rounded-lg p-3 transition hover:bg-gray-100 dark:hover:bg-gray-800 ${
-                isSelected ? 'bg-gray-100 dark:bg-gray-800' : ''
+            className={`flex w-full items-center gap-3 rounded-lg p-3 transition hover:bg-gray-50 dark:hover:bg-gray-800 ${
+                isSelected ? 'bg-gray-200 dark:bg-gray-700 border-l-4 border-primary' : ''
             }`}
             onClick={onClick}
         >
diff --git a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
index 90693f06..0bf3f738 100644
--- a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
@@ -12,6 +12,22 @@
 	let messageValue = $state('');
 	let messagesContainer: HTMLDivElement;
 
+	// Function to remove duplicate messages by ID
+	function removeDuplicateMessages(
+		messagesArray: Record<string, unknown>[]
+	): Record<string, unknown>[] {
+		const seen = new Set<string>();
+		return messagesArray.filter((msg) => {
+			const id = msg.id as string;
+			if (seen.has(id)) {
+				console.log(`Removing duplicate message with ID: ${id}`);
+				return false;
+			}
+			seen.add(id);
+			return true;
+		});
+	}
+
 	function scrollToBottom() {
 		if (messagesContainer) {
 			messagesContainer.scrollTop = messagesContainer.scrollHeight;
@@ -38,11 +54,17 @@
 		};
 
 		eventSource.onmessage = (e) => {
-			const data = JSON.parse(e.data);
-			console.log('messages', data);
-			addMessages(data);
-			// Use setTimeout to ensure DOM has updated
-			setTimeout(scrollToBottom, 0);
+			try {
+				const data = JSON.parse(e.data);
+				console.log('📨 SSE message received:', data);
+				console.log('Current messages count before adding:', messages.length);
+				addMessages(data);
+				console.log('Messages count after adding:', messages.length);
+				// Use setTimeout to ensure DOM has updated
+				setTimeout(scrollToBottom, 0);
+			} catch (error) {
+				console.error('Error parsing SSE message:', error);
+			}
 		};
 	}
 
@@ -112,7 +134,18 @@
 			};
 		});
 
-		messages = messages.concat(processedMessages);
+		// Prevent duplicate messages by checking IDs
+		const existingIds = new Set(messages.map((msg) => msg.id));
+		const uniqueNewMessages = processedMessages.filter((msg) => !existingIds.has(msg.id));
+
+		if (uniqueNewMessages.length > 0) {
+			console.log(`Adding ${uniqueNewMessages.length} new unique messages`);
+			const newMessagesArray = messages.concat(uniqueNewMessages);
+			// Final safety check to remove any duplicates
+			messages = removeDuplicateMessages(newMessagesArray);
+		} else {
+			console.log('No new unique messages to add');
+		}
 	}
 
 	onMount(async () => {
@@ -124,7 +157,7 @@
 
 <section class="chat relative px-0">
 	<div class="h-[calc(100vh-220px)] overflow-auto" bind:this={messagesContainer}>
-		{#each messages as msg (msg.id)}
+		{#each removeDuplicateMessages(messages) as msg (msg.id)}
 			<ChatMessage
 				isOwn={msg.isOwn as boolean}
 				userImgSrc={msg.userImgSrc as string}