diff --git a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
index 0a14b4666..5af999e19 100644
--- a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
+++ b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { computed, defineOptions } from 'vue';
+import { computed, defineOptions, useAttrs } from 'vue';
 
 import ImageChip from 'next/message/chips/Image.vue';
 import VideoChip from 'next/message/chips/Video.vue';
 import AudioChip from 'next/message/chips/Audio.vue';
 import FileChip from 'next/message/chips/File.vue';
+import { useMessageContext } from '../provider.js';
 
 import { ATTACHMENT_TYPES } from '../constants';
 
@@ -32,9 +33,26 @@ defineOptions({
   inheritAttrs: false,
 });
 
+const attrs = useAttrs();
+const { orientation } = useMessageContext();
+
+const classToApply = computed(() => {
+  const baseClasses = [attrs.class, 'flex', 'flex-wrap'];
+
+  if (orientation.value === 'right') {
+    baseClasses.push('justify-end');
+  }
+
+  return baseClasses;
+});
+
+const allAttachments = computed(() => {
+  return Array.isArray(props.attachments) ? props.attachments : [];
+});
+
 const mediaAttachments = computed(() => {
   const allowedTypes = [ATTACHMENT_TYPES.IMAGE, ATTACHMENT_TYPES.VIDEO];
-  const mediaTypes = props.attachments.filter(attachment =>
+  const mediaTypes = allAttachments.value.filter(attachment =>
     allowedTypes.includes(attachment.fileType)
   );
 
@@ -45,24 +63,20 @@ const mediaAttachments = computed(() => {
 });
 
 const recordings = computed(() => {
-  return props.attachments.filter(
+  return allAttachments.value.filter(
     attachment => attachment.fileType === ATTACHMENT_TYPES.AUDIO
   );
 });
 
 const files = computed(() => {
-  return props.attachments.filter(
+  return allAttachments.value.filter(
     attachment => attachment.fileType === ATTACHMENT_TYPES.FILE
   );
 });
 </script>
 
 <template>
-  <div
-    v-if="mediaAttachments.length"
-    :class="[$attrs.class]"
-    class="flex flex-wrap"
-  >
+  <div v-if="mediaAttachments.length" :class="classToApply">
     <template v-for="attachment in mediaAttachments" :key="attachment.id">
       <ImageChip
         v-if="attachment.fileType === ATTACHMENT_TYPES.IMAGE"
@@ -74,7 +88,7 @@ const files = computed(() => {
       />
     </template>
   </div>
-  <div v-if="recordings.length" :class="[$attrs.class]" class="flex flex-wrap">
+  <div v-if="recordings.length" :class="classToApply">
     <AudioChip
       v-for="attachment in recordings"
       :key="attachment.id"
@@ -82,7 +96,7 @@ const files = computed(() => {
       :attachment="attachment"
     />
   </div>
-  <div v-if="files.length" :class="[$attrs.class]" class="flex flex-wrap">
+  <div v-if="files.length" :class="classToApply">
     <FileChip
       v-for="attachment in files"
       :key="attachment.id"