diff --git a/addons/mail/static/src/components/attachment_card/attachment_card.xml b/addons/mail/static/src/components/attachment_card/attachment_card.xml
index c63a8df64fb..dfaa2dac9d5 100644
--- a/addons/mail/static/src/components/attachment_card/attachment_card.xml
+++ b/addons/mail/static/src/components/attachment_card/attachment_card.xml
@@ -5,7 +5,7 @@
             <t t-if="attachmentCard">
                 <div class="o_AttachmentCard d-flex o-has-card-details"
                      t-att-class="{
-                            'o-downloadable': !attachmentCard.attachmentList.composerView,
+                            'o-downloadable': !attachmentCard.attachmentList.composerViewOwner,
                             'o-isUploading': attachmentCard.attachment.isUploading,
                             'o-viewable': attachmentCard.attachment.isViewable,
                             }" t-att-title="attachmentCard.attachment.displayName ? attachmentCard.attachment.displayName : undefined" t-att-data-id="attachmentCard.attachment.localId"
@@ -28,28 +28,28 @@
                         </t>
                     </div>
                     <!-- Attachment aside -->
-                    <t t-if="(!attachmentCard.attachmentList.composerView or attachmentCard.attachment.isEditable)">
-                        <div class="o_AttachmentCard_aside position-relative overflow-hidden" t-att-class="{ 'o-has-multiple-action d-flex flex-column': !attachmentCard.attachmentList.composerView and attachmentCard.attachment.isEditable }">
+                    <t t-if="(!attachmentCard.attachmentList.composerViewOwner or attachmentCard.attachment.isEditable)">
+                        <div class="o_AttachmentCard_aside position-relative overflow-hidden" t-att-class="{ 'o-has-multiple-action d-flex flex-column': !attachmentCard.attachmentList.composerViewOwner and attachmentCard.attachment.isEditable }">
                             <!-- Uploading icon -->
-                            <t t-if="attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerView">
+                            <t t-if="attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
                                 <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploading d-flex justify-content-center align-items-center" title="Uploading">
                                     <i class="fa fa-spin fa-spinner"/>
                                 </div>
                             </t>
                             <!-- Uploaded icon -->
-                            <t t-if="!attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerView">
+                            <t t-if="!attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
                                 <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploaded d-flex justify-content-center align-items-center" title="Uploaded">
                                     <i class="fa fa-check"/>
                                 </div>
                             </t>
                             <!-- Remove button -->
                             <t t-if="attachmentCard.attachment.isEditable">
-                                <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUnlink d-flex justify-content-center align-items-center" t-att-class="{ 'o-pretty position-absolute': attachmentCard.attachmentList.composerView }" t-on-click="attachmentCard.onClickUnlink" title="Remove">
+                                <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUnlink d-flex justify-content-center align-items-center" t-att-class="{ 'o-pretty position-absolute': attachmentCard.attachmentList.composerViewOwner }" t-on-click="attachmentCard.onClickUnlink" title="Remove">
                                     <i class="fa fa-trash"/>
                                 </div>
                             </t>
                             <!-- Download button -->
-                            <t t-if="!attachmentCard.attachmentList.composerView and !attachmentCard.attachment.isUploading">
+                            <t t-if="!attachmentCard.attachmentList.composerViewOwner and !attachmentCard.attachment.isUploading">
                                 <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemDownload d-flex justify-content-center align-items-center" t-on-click="attachmentCard.attachment.onClickDownload" title="Download">
                                     <i class="fa fa-download"/>
                                 </div>
diff --git a/addons/mail/static/src/components/attachment_image/attachment_image.xml b/addons/mail/static/src/components/attachment_image/attachment_image.xml
index 4c2e776ba0a..c4a135efce5 100644
--- a/addons/mail/static/src/components/attachment_image/attachment_image.xml
+++ b/addons/mail/static/src/components/attachment_image/attachment_image.xml
@@ -23,7 +23,7 @@
                     <t t-if="attachmentImage.attachment.isEditable">
                         <div class="o_AttachmentImage_imageOverlay text-right p-2 text-white opacity-0 opacity-100-hover">
                             <div class="o_AttachmentImage_action o_AttachmentImage_actionUnlink btn btn-sm btn-dark rounded opacity-75 opacity-100-hover"
-                                t-att-class="{'o-pretty': attachmentImage.attachmentList.composerView}" t-on-click="attachmentImage.onClickUnlink" title="Remove"
+                                t-att-class="{'o-pretty': attachmentImage.attachmentList.composerViewOwner}" t-on-click="attachmentImage.onClickUnlink" title="Remove"
                             >
                                 <i class="fa fa-trash"/>
                             </div>
diff --git a/addons/mail/static/src/models/attachment_card/attachment_card.js b/addons/mail/static/src/models/attachment_card/attachment_card.js
index a145b1eac15..41b15448c93 100644
--- a/addons/mail/static/src/models/attachment_card/attachment_card.js
+++ b/addons/mail/static/src/models/attachment_card/attachment_card.js
@@ -30,7 +30,7 @@ registerModel({
             if (!this.attachment) {
                 return;
             }
-            if (this.attachmentList.composerView) {
+            if (this.attachmentList.composerViewOwner) {
                 this.component.trigger('o-attachment-removed', { attachmentLocalId: this.attachment.localId });
                 this.attachment.remove();
             } else {
diff --git a/addons/mail/static/src/models/attachment_image/attachment_image.js b/addons/mail/static/src/models/attachment_image/attachment_image.js
index 90a7fd7fd20..1b54dbc112f 100644
--- a/addons/mail/static/src/models/attachment_image/attachment_image.js
+++ b/addons/mail/static/src/models/attachment_image/attachment_image.js
@@ -30,7 +30,7 @@ registerModel({
             if (!this.attachment) {
                 return;
             }
-            if (this.attachmentList.composerView) {
+            if (this.attachmentList.composerViewOwner) {
                 this.component.trigger('o-attachment-removed', { attachmentLocalId: this.attachment.localId });
                 this.attachment.remove();
             } else {
@@ -45,13 +45,13 @@ registerModel({
             if (!this.attachmentList) {
                 return clear();
             }
-            if (this.attachmentList.composerView) {
+            if (this.attachmentList.composerViewOwner) {
                 return 50;
             }
             if (this.attachmentList.attachmentBoxViewOwner) {
                 return 160;
             }
-            if (this.attachmentList.message) {
+            if (this.attachmentList.messageViewOwner) {
                 return 300;
             }
         },
diff --git a/addons/mail/static/src/models/attachment_list/attachment_list.js b/addons/mail/static/src/models/attachment_list/attachment_list.js
index 23b93cdf275..b76cc35df32 100644
--- a/addons/mail/static/src/models/attachment_list/attachment_list.js
+++ b/addons/mail/static/src/models/attachment_list/attachment_list.js
@@ -6,7 +6,7 @@ import { clear, insertAndReplace, replace } from '@mail/model/model_field_comman
 
 registerModel({
     name: 'AttachmentList',
-    identifyingFields: [['composerView', 'messageView', 'attachmentBoxViewOwner']],
+    identifyingFields: [['composerViewOwner', 'messageViewOwner', 'attachmentBoxViewOwner']],
     recordMethods: {
         /**
          * Select the next attachment.
@@ -39,17 +39,17 @@ registerModel({
             }));
         },
         /**
-         * @returns {Attachment[]}
+         * @returns {FieldCommand}
          */
         _computeAttachments() {
-            if (this.message) {
-                return replace(this.message.attachments);
+            if (this.messageViewOwner) {
+                return replace(this.messageViewOwner.message.attachments);
             }
             if (this.attachmentBoxViewOwner) {
                 return replace(this.attachmentBoxViewOwner.chatter.thread.allAttachments);
             }
-            if (this.composerView && this.composerView.composer) {
-                return replace(this.composerView.composer.attachments);
+            if (this.composerViewOwner && this.composerViewOwner.composer) {
+                return replace(this.composerViewOwner.composer.attachments);
             }
             return clear();
         },
@@ -110,7 +110,7 @@ registerModel({
         /**
          * Link with a composer view to handle attachments.
          */
-        composerView: one('ComposerView', {
+        composerViewOwner: one('ComposerView', {
             inverse: 'attachmentList',
             readonly: true,
         }),
@@ -120,13 +120,10 @@ registerModel({
         imageAttachments: many('Attachment', {
             compute: '_computeImageAttachments',
         }),
-        message: one('Message', {
-            related: 'messageView.message'
-        }),
         /**
          * Link with a message view to handle attachments.
          */
-        messageView: one('MessageView', {
+        messageViewOwner: one('MessageView', {
             inverse: 'attachmentList',
             readonly: true,
         }),
diff --git a/addons/mail/static/src/models/composer_view/composer_view.js b/addons/mail/static/src/models/composer_view/composer_view.js
index bc2712c5cde..3fa80680b7b 100644
--- a/addons/mail/static/src/models/composer_view/composer_view.js
+++ b/addons/mail/static/src/models/composer_view/composer_view.js
@@ -205,7 +205,7 @@ registerModel({
         },
         /**
          * @private
-         * @param {MouseEvent} ev 
+         * @param {MouseEvent} ev
          */
         onClickEmoji(ev) {
             if (this.textInputComponent) {
@@ -924,7 +924,7 @@ registerModel({
          */
         attachmentList: one('AttachmentList', {
             compute: '_computeAttachmentList',
-            inverse: 'composerView',
+            inverse: 'composerViewOwner',
             isCausal: true,
             readonly: true,
         }),
diff --git a/addons/mail/static/src/models/message_view/message_view.js b/addons/mail/static/src/models/message_view/message_view.js
index 76c669559bd..9666ecec1b7 100644
--- a/addons/mail/static/src/models/message_view/message_view.js
+++ b/addons/mail/static/src/models/message_view/message_view.js
@@ -143,7 +143,7 @@ registerModel({
          */
         attachmentList: one('AttachmentList', {
             compute: '_computeAttachmentList',
-            inverse: 'messageView',
+            inverse: 'messageViewOwner',
             isCausal: true,
             readonly: true,
         }),