diff --git a/app/api/rocket-chat/messages/route.ts b/app/api/rocket-chat/messages/route.ts
index bbdd0b2d..432c3856 100644
--- a/app/api/rocket-chat/messages/route.ts
+++ b/app/api/rocket-chat/messages/route.ts
@@ -145,14 +145,8 @@ export async function GET(request: Request) {
 
     // Filter subscriptions for the current user
     const userSubscriptions = subscriptionsData.update.filter((sub: any) => {
-      // For direct messages (t: 'd')
-      if (sub.t === 'd') {
-        // Make sure the room ID contains the current user's ID
-        const participants = sub.rid.split('');
-        return participants.includes(currentUser._id);
-      }
-      // For channels (t: 'c') and private groups (t: 'p')
-      return ['c', 'p'].includes(sub.t) && sub.u._id === currentUser._id;
+      // Include all types of rooms the user is subscribed to
+      return ['d', 'c', 'p'].includes(sub.t);
     });
 
     console.log('Filtered user subscriptions:', {
@@ -163,8 +157,7 @@ export async function GET(request: Request) {
         type: sub.t,
         name: sub.fname || sub.name,
         rid: sub.rid,
-        alert: sub.alert,
-        isOwn: sub.u._id === currentUser._id
+        alert: sub.alert
       }))
     });
 
@@ -177,19 +170,25 @@ export async function GET(request: Request) {
       processedRooms.add(subscription.rid);
 
       try {
-        // Determine the correct endpoint based on room type
+        // Determine the correct endpoint and parameters based on room type
         let endpoint;
-        if (subscription.t === 'c') {
-          endpoint = 'channels.messages';
-        } else if (subscription.t === 'p') {
-          endpoint = 'groups.messages';
-        } else {
-          endpoint = 'im.messages';
+        switch (subscription.t) {
+          case 'c':
+            endpoint = 'channels.messages';
+            break;
+          case 'p':
+            endpoint = 'groups.messages';
+            break;
+          case 'd':
+            endpoint = 'im.messages';
+            break;
+          default:
+            continue;
         }
 
         const queryParams = new URLSearchParams({
           roomId: subscription.rid,
-          count: '3'
+          count: '5'
         });
         
         const messagesResponse = await fetch(
@@ -201,13 +200,11 @@ export async function GET(request: Request) {
 
         if (!messagesResponse.ok) {
           console.error(`Failed to get messages for room ${subscription.name}:`, messagesResponse.status);
-          const errorText = await messagesResponse.text();
-          console.error(`Messages error details for ${subscription.name}:`, errorText);
           continue;
         }
 
         const messageData = await messagesResponse.json();
-        console.log(`Messages for room ${subscription.name}:`, {
+        console.log(`Messages for room ${subscription.fname || subscription.name}:`, {
           success: messageData.success,
           count: messageData.count,
           hasMessages: messageData.messages?.length > 0
@@ -217,10 +214,13 @@ export async function GET(request: Request) {
           // Process each message from the room
           for (const message of messageData.messages) {
             const messageUser = message.u || {};
-            const username = messageUser.username || subscription.name || 'unknown';
-            const displayName = subscription.fname || subscription.name || username;
+            const username = messageUser.username || 'unknown';
             
-            // Format the timestamp
+            // Get proper display names
+            let roomDisplayName = subscription.fname || subscription.name;
+            let userDisplayName = messageUser.name || username;
+            
+            // Format timestamp
             const timestamp = new Date(message.ts);
             const now = new Date();
             let formattedTime = '';
@@ -228,21 +228,19 @@ export async function GET(request: Request) {
             if (isNaN(timestamp.getTime())) {
               formattedTime = 'Invalid Date';
             } else if (timestamp.toDateString() === now.toDateString()) {
-              // Today - show time only
               formattedTime = timestamp.toLocaleTimeString('fr-FR', { 
                 hour: '2-digit', 
                 minute: '2-digit' 
               });
             } else {
-              // Not today - show date
               formattedTime = timestamp.toLocaleDateString('fr-FR', {
                 day: '2-digit',
                 month: 'short'
               });
             }
 
-            // Create initials from display name
-            const initials = displayName
+            // Create initials for the sender
+            const initials = userDisplayName
               .split(' ')
               .map((n: string) => n[0])
               .slice(0, 2)
@@ -254,49 +252,43 @@ export async function GET(request: Request) {
               text: message.msg || '',
               timestamp: formattedTime,
               rawTimestamp: message.ts,
-              roomName: displayName,
+              roomName: roomDisplayName,
               roomType: subscription.t,
-              unread: subscription.unread || 0,
-              userMentions: subscription.userMentions || 0,
-              alert: subscription.alert || false,
-              lastSeen: subscription.ls,
-              u: messageUser,
               sender: {
                 _id: messageUser._id,
                 username: username,
-                name: displayName,
+                name: userDisplayName,
                 initials: initials,
                 color: getAvatarColor(username)
               },
-              isOwnMessage: messageUser.username === currentUser.username,
+              isOwnMessage: messageUser._id === currentUser._id,
               room: {
                 id: subscription.rid,
                 type: subscription.t,
-                name: displayName,
+                name: roomDisplayName,
                 isChannel: subscription.t === 'c',
+                isPrivateGroup: subscription.t === 'p',
                 isDirect: subscription.t === 'd',
-                link: subscription.t === 'c' 
-                  ? `${baseUrl}/channel/${subscription.name}`
-                  : `${baseUrl}/direct/${subscription.name}`
+                link: `${baseUrl}/${subscription.t === 'd' ? 'direct' : subscription.t === 'p' ? 'group' : 'channel'}/${subscription.name}`
               }
             });
           }
         }
       } catch (error) {
-        console.error(`Error fetching message for room ${subscription.name}:`, error);
+        console.error(`Error fetching messages for room ${subscription.name}:`, error);
         continue;
       }
     }
 
-    // Sort messages by raw timestamp (newest first) and limit to 7
-    messages.sort((a, b) => new Date(b.rawTimestamp).getTime() - new Date(a.rawTimestamp).getTime());
-    
-    const limitedMessages = messages.slice(0, 7);
+    // Sort messages by timestamp (newest first) and limit
+    const sortedMessages = messages
+      .sort((a, b) => new Date(b.rawTimestamp).getTime() - new Date(a.rawTimestamp).getTime())
+      .slice(0, 10);
 
     return NextResponse.json({
-      messages: limitedMessages,
+      messages: sortedMessages,
       total: messages.length,
-      hasMore: messages.length > 7
+      hasMore: messages.length > 10
     }, { status: 200 });
   } catch (error) {
     console.error('Error in messages endpoint:', error);