diff --git a/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue b/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
index 5c83067f3..f2f92e70a 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Email/Index.vue
@@ -127,7 +127,10 @@ const textToShow = computed(() => {
       v-if="Array.isArray(attachments) && attachments.length"
       class="px-4 pb-4 space-y-2"
     >
-      <AttachmentChips :attachments="attachments" class="gap-1" />
+      <AttachmentChips
+        :attachments="attachments"
+        class="flex flex-col gap-2.5"
+      />
     </section>
   </BaseBubble>
 </template>
diff --git a/app/javascript/dashboard/components-next/message/bubbles/Text/Index.vue b/app/javascript/dashboard/components-next/message/bubbles/Text/Index.vue
index 1a7997f50..83388bed5 100644
--- a/app/javascript/dashboard/components-next/message/bubbles/Text/Index.vue
+++ b/app/javascript/dashboard/components-next/message/bubbles/Text/Index.vue
@@ -25,7 +25,10 @@ const isEmpty = computed(() => {
         {{ $t('CONVERSATION.NO_CONTENT') }}
       </span>
       <FormattedContent v-if="content" :content="content" />
-      <AttachmentChips :attachments="attachments" class="gap-2" />
+      <AttachmentChips
+        :attachments="attachments"
+        class="flex flex-col gap-2.5"
+      />
       <template v-if="isTemplate">
         <div
           v-if="contentAttributes.submittedEmail"
diff --git a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
index 92c4bc8b0..595903e16 100644
--- a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
+++ b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
@@ -75,26 +75,24 @@ const files = computed(() => {
 </script>
 
 <template>
-  <div class="flex flex-col gap-2.5">
-    <div v-if="mediaAttachments.length" :class="classToApply">
-      <ImageVideoChip :attachments="mediaAttachments" />
-    </div>
+  <div v-if="mediaAttachments.length" :class="classToApply">
+    <ImageVideoChip :attachments="mediaAttachments" />
+  </div>
 
-    <div v-if="recordings.length" :class="classToApply">
-      <div v-for="attachment in recordings" :key="attachment.id" class="w-full">
-        <AudioChip
-          class="bg-n-alpha-3 dark:bg-n-alpha-2 text-n-slate-12"
-          :attachment="attachment"
-        />
-      </div>
-    </div>
-
-    <div v-if="files.length" :class="classToApply">
-      <FileChip
-        v-for="attachment in files"
-        :key="attachment.id"
+  <div v-if="recordings.length" :class="classToApply">
+    <div v-for="attachment in recordings" :key="attachment.id" class="w-full">
+      <AudioChip
+        class="bg-n-alpha-3 dark:bg-n-alpha-2 text-n-slate-12"
         :attachment="attachment"
       />
     </div>
   </div>
+
+  <div v-if="files.length" :class="classToApply">
+    <FileChip
+      v-for="attachment in files"
+      :key="attachment.id"
+      :attachment="attachment"
+    />
+  </div>
 </template>