diff --git a/src/views/contents/ContentCard.vue b/src/views/contents/ContentCard.vue
index 8e2037d..24494fe 100644
--- a/src/views/contents/ContentCard.vue
+++ b/src/views/contents/ContentCard.vue
@@ -78,13 +78,18 @@
           <v-icon>mdi-comment-outline</v-icon>
         </v-btn>
 
-        <!-- Utilisation de l'objet creator ici -->
+ 
         <donation-button :creator="creator" iconColorClass="text-black"></donation-button>
       </div>
 
       <div :class="{'hidden': !commentsVisible}">
         <h2 class="font-sans font-semibold mt-2">Commentaires</h2>
-        <message-list :subject-id="props.content.id" :messages="messages"></message-list>
+        <message-list
+            :subject-id="props.content.id"
+            :messages="messages"
+            @messages-found="handleMessagesFound"
+        ></message-list>
+
       </div>
 
       <div class="py-2">
@@ -121,9 +126,7 @@ const loading = ref(true);
 const hasUrls = computed(() => !!props.content.urls && props.content.urls.length > 0);
 const commentsVisible = ref(false);
 const messages = ref([]);
-
-// Propriété calculée pour vérifier s'il y a des commentaires
-const hasComments = computed(() => messages.value.length > 0);
+const hasComments = ref(false);
 
 onBeforeMount(async () => await fetchCreatorData(creatorAlias.value))
 
@@ -139,6 +142,12 @@ async function fetchCreatorData(creatorAlias) {
   }
 }
 
+function handleMessagesFound(hasMessages) {
+  if (hasMessages) {
+    hasComments.value = true;   
+  }
+}
+
 function addMessage(newMessage) {
   messages.value.unshift(newMessage);
   commentsVisible.value = true;
@@ -204,7 +213,7 @@ function redirectToContent() {
   display: none;
 }
 
-.comment-active-v-icon {
-  color: #DB1AAA;
+.comment-active .v-icon {
+  color: #D63DAB; 
 }
 </style>
diff --git a/src/views/messages/MessageList.vue b/src/views/messages/MessageList.vue
index a7ff5d0..a94167d 100644
--- a/src/views/messages/MessageList.vue
+++ b/src/views/messages/MessageList.vue
@@ -1,22 +1,17 @@
 <template>
-
-  <v-infinite-scroll :items="messages"
-                     :onLoad="load"
-                     mode="manual"
-                     class="justify-items-center">
-
+  <v-infinite-scroll
+      :items="messages"
+      :onLoad="load"
+      mode="manual"
+      class="justify-items-center"
+  >
     <template v-for="(message, index) in messages" :key="index">
-      <message :message="message"
-               class="border-b"
-      ></message>
+      <message :message="message" class="border-b"></message>
     </template>
 
     <template v-slot:load-more="{ props }">
-      <v-btn
-          size="small"
-          variant="outlined"
-          v-bind="props"
-      >Voir plus de commentaires
+      <v-btn size="small" variant="outlined" v-bind="props">
+        Voir plus de commentaires
       </v-btn>
     </template>
 
@@ -27,72 +22,71 @@
     <template v-slot:error>
       <v-alert type="error">{{ errorMessage }}</v-alert>
     </template>
-
   </v-infinite-scroll>
-
 </template>
 
 <script setup>
-
+import { ref, onBeforeMount } from 'vue';
+import { useClient } from '@/plugins/api.js';
 import Message from "@/views/messages/Message.vue";
 
-import {useClient} from '@/plugins/api.js';
-import {onBeforeMount, ref} from 'vue';
-
+const emit = defineEmits(['messages-found']);
 const props = defineProps({
   subjectId: {
     type: String,
-    required: true
+    required: true,
   },
   messages: {
-    default: []
-  }
+    type: Array,
+    default: () => [],
+  },
 });
 
-const errorMessage = ref()
-let last_id = null
+const errorMessage = ref(null);
+let last_id = null;
 const client = useClient();
 const messages = ref(props.messages);
 
 onBeforeMount(async () => {
-  if (props.subjectId == null) return
+  if (props.subjectId == null) return;
   await load({
     page_size: 2,
-    done: function (status) {
-    }
-  })
-})
+    done: function (status) {},
+  });
+});
 
-async function load({done, page_size}) {
-  if (props.subjectId == null) return
-  if (page_size === undefined) page_size = 10
+async function load({ done, page_size = 10 }) {
+  if (props.subjectId == null) return;
 
   try {
-    let uri = `/api/messages/${props.subjectId}?page_size=${page_size}`
-    if (last_id !== null) uri = uri + `&last_id=${last_id}`
-    
-    const response = await client.get(uri)
+    let uri = `/api/messages/${props.subjectId}?page_size=${page_size}`;
+    if (last_id !== null) uri = uri + `&last_id=${last_id}`;
+
+    const response = await client.get(uri);
 
     if (response.status >= 200 && response.status < 300) {
-
-      const messageCount = response.data.messages.length
+      const messageCount = response.data.messages.length;
 
       if (messageCount > 0) {
-        messages.value.push(...response.data.messages)
-        const [last_content] = response.data.messages.slice(-1)
-        last_id = last_content.id
+        messages.value.push(...response.data.messages);
+        const [last_content] = response.data.messages.slice(-1);
+        last_id = last_content.id;
+    
+        if (messageCount > 0) {
+          emit('messages-found', true);
+        }
       }
 
-      if (messageCount < page_size)
-        done('empty')
-      else
-        done('ok')
+      if (messageCount < page_size) {
+        done('empty');
+      } else {
+        done('ok');
+      }
     }
   } catch (error) {
-    console.error("Failed to fetch posts", error);
-    errorMessage.value = error
-    done('error')
+    console.error("Failed to fetch messages", error);
+    errorMessage.value = error.message || "Failed to fetch messages";
+    done('error');
   }
 }
-
-</script>
\ No newline at end of file
+</script>