diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index 413eaf83..0b6fcffb 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -937,6 +937,7 @@ const whatsappMessages = createListResource({
     'template',
     'use_template',
     'message_id',
+    'is_reply',
     'reply_to_message_id',
     'creation',
     'message',
@@ -965,11 +966,29 @@ const whatsappMessages = createListResource({
           reactedMessage.reaction = message.message
         }
       })
+
+    // loop on filtered data where message.is_reply == 1
+    data
+      .filter((message) => message.is_reply)
+      .forEach((message) => {
+        // find the message that this message is replying to
+        const repliedMessage = data.find(
+          (m) => m.message_id == message.reply_to_message_id
+        )
+        // if the replied message is found, add the reply to it
+        if (repliedMessage) {
+          message.reply_message = repliedMessage.message
+          message.reply_to = repliedMessage.name
+        }
+      })
+
     return data.filter((message) => message.content_type != 'reaction')
   },
   onSuccess: () => nextTick(() => scroll()),
 })
 
+const replyMessage = ref({})
+
 function get_activities() {
   if (!all_activities.data?.versions) return []
   if (!all_activities.data?.calls.length)
diff --git a/frontend/src/components/WhatsAppArea.vue b/frontend/src/components/WhatsAppArea.vue
index 88a92a04..8ec6b474 100644
--- a/frontend/src/components/WhatsAppArea.vue
+++ b/frontend/src/components/WhatsAppArea.vue
@@ -14,9 +14,9 @@
         class="group/message relative max-w-[90%] rounded-md bg-gray-50 p-1.5 pl-2 text-base shadow-sm"
       >
         <div
-          v-if="whatsapp.reply_to_message_id"
+          v-if="whatsapp.is_reply"
           class="mb-1 cursor-pointer rounded-md border-0 border-l-4 border-green-500 bg-gray-200 px-2 py-4"
-          v-html="formatWhatsAppMessage(whatsapp.reply_to_message_id)"
+          v-html="formatWhatsAppMessage(whatsapp.reply_message)"
         />
         <div class="inline-flex gap-2">
           <div