From da40fedde00cda5dbb2ec4e8ff7a9db0341b51f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 9 May 2022 12:16:11 +0000
Subject: [PATCH] [IMP] mail, *: pass record instead of local id in props
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: hr_holidays, im_livechat, snailmail, website_livechat

Task-2847927

closes odoo/odoo#90882

Related: odoo/enterprise#27110
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../partner_im_status_icon_tests.js           |  2 +-
 .../components/thread_icon_tests.js           |  2 +-
 .../discuss_sidebar/discuss_sidebar.xml       |  2 +-
 .../components/thread_icon_tests.js           |  2 +-
 .../thread_textual_typing_status_tests.js     |  2 +-
 .../component_hooks/use_component_to_model.js | 27 +++++--------------
 .../src/component_hooks/use_ref_to_model.js   | 27 +++++--------------
 .../component_hooks/use_update_to_model.js    |  8 ++----
 .../src/components/activity/activity.js       |  8 +++---
 .../src/components/activity/activity.xml      |  4 +--
 .../components/activity_box/activity_box.js   |  4 +--
 .../components/activity_box/activity_box.xml  |  2 +-
 .../activity_mark_done_popover_content.js     |  8 +++---
 .../attachment_box/attachment_box.js          |  6 ++---
 .../attachment_box/attachment_box.xml         |  4 +--
 .../attachment_card/attachment_card.js        |  4 +--
 .../attachment_delete_confirm.js              |  6 ++---
 .../attachment_image/attachment_image.js      |  4 +--
 .../attachment_list/attachment_list.js        |  4 +--
 .../attachment_list/attachment_list.xml       |  4 +--
 .../attachment_viewer/attachment_viewer.js    |  6 ++---
 .../autocomplete_input/autocomplete_input.js  |  4 +--
 .../channel_invitation_form.js                | 10 +++----
 .../channel_invitation_form.xml               |  4 +--
 ...nnel_invitation_form_selectable_partner.js |  8 +++---
 ...nel_invitation_form_selectable_partner.xml |  2 +-
 ...hannel_invitation_form_selected_partner.js |  8 +++---
 .../channel_member/channel_member.js          |  8 +++---
 .../channel_member/channel_member.xml         |  2 +-
 .../channel_member_list.js                    |  4 +--
 .../channel_member_list.xml                   |  2 +-
 .../src/components/chat_window/chat_window.js |  4 +--
 .../components/chat_window/chat_window.xml    | 12 ++++-----
 .../chat_window_header/chat_window_header.js  |  8 +++---
 .../chat_window_header/chat_window_header.xml |  2 +-
 .../chat_window_hidden_menu.xml               |  2 +-
 .../chat_window_hidden_menu_item.js           |  4 +--
 .../chat_window_hidden_menu_item.xml          |  4 +--
 .../chat_window_manager.xml                   |  2 +-
 .../static/src/components/chatter/chatter.js  |  8 +++---
 .../static/src/components/chatter/chatter.xml | 10 +++----
 .../chatter_container/chatter_container.xml   |  2 +-
 .../chatter_topbar/chatter_topbar.js          |  4 +--
 .../chatter_topbar/chatter_topbar.xml         |  6 ++---
 .../src/components/composer/composer.js       |  8 +++---
 .../src/components/composer/composer.xml      | 12 ++++-----
 .../composer_suggested_recipient.js           |  6 ++---
 .../composer_suggested_recipient_list.js      |  4 +--
 .../composer_suggested_recipient_list.xml     |  4 +--
 .../composer_suggestion.js                    |  4 +--
 .../composer_suggestion.xml                   |  2 +-
 .../composer_suggestion_list.js               |  4 +--
 .../composer_suggestion_list.xml              |  4 +--
 .../composer_text_input.js                    |  8 +++---
 .../composer_text_input.xml                   |  2 +-
 .../delete_message_confirm.js                 |  6 ++---
 .../delete_message_confirm.xml                |  2 +-
 .../static/src/components/dialog/dialog.js    |  4 +--
 .../static/src/components/dialog/dialog.xml   |  2 +-
 .../dialog_manager/dialog_manager.xml         |  2 +-
 .../static/src/components/discuss/discuss.js  |  4 +--
 .../static/src/components/discuss/discuss.xml | 12 ++++-----
 .../discuss_container/discuss_container.xml   |  2 +-
 .../discuss_mobile_mailbox_selection.js       |  4 +--
 .../discuss_mobile_mailbox_selection.xml      |  2 +-
 .../discuss_mobile_mailbox_selection_item.js  |  8 +++---
 .../discuss_public_view.js                    |  4 +--
 .../discuss_public_view.xml                   |  4 +--
 .../discuss_sidebar/discuss_sidebar.js        |  6 ++---
 .../discuss_sidebar/discuss_sidebar.xml       | 10 +++----
 .../discuss_sidebar_category.js               |  4 +--
 .../discuss_sidebar_category.xml              |  6 ++---
 .../discuss_sidebar_category_item.js          |  4 +--
 .../discuss_sidebar_category_item.xml         |  2 +-
 .../discuss_sidebar_mailbox.js                |  4 +--
 .../discuss_sidebar_mailbox.xml               |  2 +-
 .../src/components/drop_zone/drop_zone.js     |  4 +--
 .../mail/static/src/components/emoji/emoji.js |  4 +--
 .../src/components/emoji_list/emoji_list.js   |  4 +--
 .../src/components/emoji_list/emoji_list.xml  |  2 +-
 .../components/follow_button/follow_button.js |  4 +--
 .../src/components/follower/follower.js       |  4 +--
 .../follower_list_menu/follower_list_menu.js  |  8 +++---
 .../follower_list_menu/follower_list_menu.xml |  2 +-
 .../follower_subtype/follower_subtype.js      |  4 +--
 .../follower_subtype_list.js                  |  6 ++---
 .../follower_subtype_list.xml                 |  2 +-
 .../components/mail_template/mail_template.js |  4 +--
 .../components/media_preview/media_preview.js |  8 +++---
 .../static/src/components/message/message.js  |  8 +++---
 .../static/src/components/message/message.xml | 18 ++++++-------
 .../message_action_list.js                    |  6 ++---
 .../message_action_list.xml                   |  2 +-
 .../message_author_prefix.js                  |  4 +--
 .../message_in_reply_to_view.js               |  4 +--
 .../components/message_list/message_list.js   |  6 ++---
 .../components/message_list/message_list.xml  |  2 +-
 .../message_notification_popover_content.js   |  4 +--
 .../message_reaction_group.js                 |  4 +--
 .../message_seen_indicator.js                 |  4 +--
 .../messaging_menu/messaging_menu.js          |  6 ++---
 .../messaging_menu/messaging_menu.xml         | 12 ++++-----
 .../messaging_menu_container.xml              |  2 +-
 .../messaging_menu_tab/messaging_menu_tab.js  |  4 +--
 .../mobile_messaging_navbar.js                |  4 +--
 .../notification_group/notification_group.js  |  6 ++---
 .../notification_list/notification_list.js    |  4 +--
 .../notification_list/notification_list.xml   |  8 +++---
 .../notification_request.js                   |  4 +--
 .../notification_request.xml                  |  2 +-
 .../partner_im_status_icon.js                 |  4 +--
 .../components/popover_view/popover_view.js   |  6 ++---
 .../components/popover_view/popover_view.xml  |  2 +-
 .../rtc_activity_notice.js                    |  4 +--
 .../rtc_activity_notice_container.xml         |  2 +-
 .../rtc_call_participant_card.js              |  6 ++---
 .../rtc_call_participant_card.xml             |  2 +-
 .../rtc_call_viewer/rtc_call_viewer.js        |  4 +--
 .../rtc_call_viewer/rtc_call_viewer.xml       | 10 +++----
 .../rtc_configuration_menu.js                 |  4 +--
 .../rtc_controller/rtc_controller.js          |  4 +--
 .../rtc_controller/rtc_controller.xml         |  2 +-
 .../rtc_invitation_card.js                    |  4 +--
 .../rtc_invitations/rtc_invitations.xml       |  2 +-
 .../rtc_layout_menu/rtc_layout_menu.js        |  6 ++---
 .../rtc_option_list/rtc_option_list.js        |  6 ++---
 .../src/components/rtc_video/rtc_video.js     |  4 +--
 .../src/components/thread_icon/thread_icon.js |  4 +--
 .../thread_needaction_preview.js              |  6 ++---
 .../thread_needaction_preview.xml             |  4 +--
 .../thread_preview/thread_preview.js          |  6 ++---
 .../thread_preview/thread_preview.xml         |  4 +--
 .../thread_textual_typing_status.js           |  4 +--
 .../src/components/thread_view/thread_view.js |  4 +--
 .../components/thread_view/thread_view.xml    | 10 +++----
 .../thread_view_topbar/thread_view_topbar.js  | 14 +++++-----
 .../thread_view_topbar/thread_view_topbar.xml |  4 +--
 .../components/welcome_view/welcome_view.js   |  4 +--
 .../components/welcome_view/welcome_view.xml  |  2 +-
 addons/mail/static/src/model/model_manager.js |  4 +--
 .../static/src/public/discuss_public_boot.js  |  2 +-
 .../mail/static/tests/helpers/test_utils.js   | 12 ++++-----
 .../components/follower_subtype_tests.js      |  4 +--
 .../components/follower_tests.js              |  2 +-
 .../message_seen_indicator_tests.js           |  2 +-
 .../components/message_tests.js               |  2 +-
 .../partner_im_status_icon_tests.js           |  2 +-
 .../components/thread_icon_tests.js           |  2 +-
 .../thread_textual_typing_status_tests.js     |  2 +-
 .../static/src/components/message/message.xml |  2 +-
 .../snailmail_error/snailmail_error.js        |  6 ++---
 .../snailmail_notification_popover.js         |  6 ++---
 .../components/thread_view/thread_view.xml    |  2 +-
 .../visitor_banner/visitor_banner.js          |  6 ++---
 154 files changed, 367 insertions(+), 405 deletions(-)

diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
index 3b0d4c1efd3..2c2a19cc3f3 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
@@ -11,7 +11,7 @@ QUnit.module('partner_im_status_icon_tests.js', {
     beforeEach() {
         this.createPartnerImStatusIcon = async (partner, target) => {
             await createRootMessagingComponent(partner.env, "PartnerImStatusIcon", {
-                props: { partnerLocalId: partner.localId },
+                props: { partner },
                 target,
             });
         };
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index 88ef3e5b9ee..25d48966ad2 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -12,7 +12,7 @@ QUnit.module('thread_icon_tests.js', {
     beforeEach() {
         this.createThreadIcon = async (thread, target) => {
             await createRootMessagingComponent(thread.env, "ThreadIcon", {
-                props: { threadLocalId: thread.localId },
+                props: { thread },
                 target,
             });
         };
diff --git a/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml b/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml
index 7a2e00d50f1..a73693498c7 100644
--- a/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml
+++ b/addons/im_livechat/static/src/components/discuss_sidebar/discuss_sidebar.xml
@@ -6,7 +6,7 @@
             <t t-if="categoryLivechat and categoryLivechat.categoryItems.length">
                 <DiscussSidebarCategory
                     className="'o_DiscussSidebar_category o_DiscussSidebar_categoryLivechat'"
-                    localId="categoryLivechat.localId"
+                    record="categoryLivechat"
                 />
             </t>
         </xpath>
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index fb38a8dd4db..3ddc16cb479 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -13,7 +13,7 @@ QUnit.module('thread_icon_tests.js', {
     beforeEach() {
         this.createThreadIcon = async (thread, target) => {
             await createRootMessagingComponent(thread.env, "ThreadIcon", {
-                props: { threadLocalId: thread.localId },
+                props: { thread },
                 target,
             });
         };
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
index 6d3a510a61a..63db06d1480 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
@@ -13,7 +13,7 @@ QUnit.module('thread_textual_typing_status_tests.js', {
     beforeEach() {
         this.createThreadTextualTypingStatusComponent = async (thread, target) => {
             await createRootMessagingComponent(thread.env, "ThreadTextualTypingStatus", {
-                props: { threadLocalId: thread.localId },
+                props: { thread },
                 target,
             });
         };
diff --git a/addons/mail/static/src/component_hooks/use_component_to_model.js b/addons/mail/static/src/component_hooks/use_component_to_model.js
index 2b9eee17fee..12af5a3caf3 100644
--- a/addons/mail/static/src/component_hooks/use_component_to_model.js
+++ b/addons/mail/static/src/component_hooks/use_component_to_model.js
@@ -2,7 +2,7 @@
 
 import { clear } from '@mail/model/model_field_command';
 
-const { onWillDestroy, onWillUpdateProps, useComponent } = owl;
+const { onWillUpdateProps, useComponent } = owl;
 
 /**
  * This hook provides support for saving the reference of the component directly
@@ -11,29 +11,16 @@ const { onWillDestroy, onWillUpdateProps, useComponent } = owl;
  *
  * @param {Object} param0
  * @param {string} param0.fieldName Name of the field on the target record.
- * @param {string} param0.modelName Name of the model of the target record.
  */
-export function useComponentToModel({ fieldName, modelName }) {
+export function useComponentToModel({ fieldName }) {
     const component = useComponent();
-    const { modelManager } = component.env.services.messaging;
-    const record = modelManager.models[modelName].get(component.props.localId);
-    if (record) {
-        record.update({ [fieldName]: component });
-    }
+    component.props.record.update({ [fieldName]: component });
     onWillUpdateProps(nextProps => {
-        const currentRecord = modelManager.models[modelName].get(component.props.localId);
-        const nextRecord = modelManager.models[modelName].get(nextProps.localId);
-        if (currentRecord && currentRecord !== nextRecord) {
+        const currentRecord = component.props.record;
+        const nextRecord = nextProps.record;
+        if (currentRecord.exists() && currentRecord !== nextRecord) {
             currentRecord.update({ [fieldName]: clear() });
         }
-        if (nextRecord) {
-            nextRecord.update({ [fieldName]: component });
-        }
-    });
-    onWillDestroy(() => {
-        const record = modelManager.models[modelName].get(component.props.localId);
-        if (record) {
-            record.update({ [fieldName]: clear() });
-        }
+        nextRecord.update({ [fieldName]: component });
     });
 }
diff --git a/addons/mail/static/src/component_hooks/use_ref_to_model.js b/addons/mail/static/src/component_hooks/use_ref_to_model.js
index b841c243007..bc969345a70 100644
--- a/addons/mail/static/src/component_hooks/use_ref_to_model.js
+++ b/addons/mail/static/src/component_hooks/use_ref_to_model.js
@@ -2,7 +2,7 @@
 
 import { clear } from '@mail/model/model_field_command';
 
-const { onWillDestroy, onWillUpdateProps, useComponent, useRef } = owl;
+const { onWillUpdateProps, useComponent, useRef } = owl;
 
 /**
  * This hook provides support for saving the result of useRef directly into the
@@ -11,31 +11,18 @@ const { onWillDestroy, onWillUpdateProps, useComponent, useRef } = owl;
  *
  * @param {Object} param0
  * @param {string} param0.fieldName Name of the field on the target record.
- * @param {string} param0.modelName Name of the model of the target record.
  * @param {string} param0.refName Name of the t-ref on this component.
  */
-export function useRefToModel({ fieldName, modelName, refName }) {
+export function useRefToModel({ fieldName, refName }) {
     const component = useComponent();
-    const { modelManager } = component.env.services.messaging;
-    const record = modelManager.models[modelName].get(component.props.localId);
     const ref = useRef(refName);
-    if (record) {
-        record.update({ [fieldName]: ref });
-    }
+    component.props.record.update({ [fieldName]: ref });
     onWillUpdateProps(nextProps => {
-        const currentRecord = modelManager.models[modelName].get(component.props.localId);
-        const nextRecord = modelManager.models[modelName].get(nextProps.localId);
-        if (currentRecord && currentRecord !== nextRecord) {
+        const currentRecord = component.props.record;
+        const nextRecord = nextProps.record;
+        if (currentRecord.exists() && currentRecord !== nextRecord) {
             currentRecord.update({ [fieldName]: clear() });
         }
-        if (nextRecord) {
-            nextRecord.update({ [fieldName]: ref });
-        }
-    });
-    onWillDestroy(() => {
-        const record = modelManager.models[modelName].get(component.props.localId);
-        if (record) {
-            record.update({ [fieldName]: clear() });
-        }
+        nextRecord.update({ [fieldName]: ref });
     });
 }
diff --git a/addons/mail/static/src/component_hooks/use_update_to_model.js b/addons/mail/static/src/component_hooks/use_update_to_model.js
index 293be17f333..0a06f16cbd2 100644
--- a/addons/mail/static/src/component_hooks/use_update_to_model.js
+++ b/addons/mail/static/src/component_hooks/use_update_to_model.js
@@ -10,14 +10,10 @@ const { useComponent } = owl;
  *
  * @param {Object} param0
  * @param {string} param0.methodName Name of the method on the target record.
- * @param {string} param0.modelName Name of the model of the target record.
  */
-export function useUpdateToModel({ methodName, modelName }) {
+export function useUpdateToModel({ methodName }) {
     const component = useComponent();
     useUpdate({ func: () => {
-        const record = component.env.services.messaging.modelManager.models[modelName].get(component.props.localId);
-        if (record) {
-            record[methodName]();
-        }
+        component.props.record[methodName]();
     } });
 }
diff --git a/addons/mail/static/src/components/activity/activity.js b/addons/mail/static/src/components/activity/activity.js
index f947f2af1fd..fb06f7734f7 100644
--- a/addons/mail/static/src/components/activity/activity.js
+++ b/addons/mail/static/src/components/activity/activity.js
@@ -14,21 +14,21 @@ export class Activity extends LegacyComponent {
      */
      setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'ActivityView' });
-        useRefToModel({ fieldName: 'markDoneButtonRef', modelName: 'ActivityView', refName: 'markDoneButton', });
+        useComponentToModel({ fieldName: 'component' });
+        useRefToModel({ fieldName: 'markDoneButtonRef', refName: 'markDoneButton', });
     }
 
     /**
      * @returns {ActivityView}
      */
     get activityView() {
-        return this.messaging && this.messaging.models['ActivityView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(Activity, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Activity',
     components: { Popover },
 });
diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml
index 1b0a2b9d914..a007ceb04f1 100644
--- a/addons/mail/static/src/components/activity/activity.xml
+++ b/addons/mail/static/src/components/activity/activity.xml
@@ -111,7 +111,7 @@
                             <t t-foreach="activityView.mailTemplateViews" t-as="mailTemplateView" t-key="mailTemplateView.localId">
                                 <MailTemplate
                                     className="'o_Activity_mailTemplate'"
-                                    localId="mailTemplateView.localId"
+                                    record="mailTemplateView"
                                 />
                             </t>
                         </div>
@@ -122,7 +122,7 @@
                             <button class="o_Activity_toolButton o_Activity_markDoneButton btn btn-link btn-primary pt-0 pl-0" t-att-title="activityView.markDoneText" t-ref="markDoneButton" t-on-click="activityView.onClickMarkDoneButton">
                                 <i class="fa fa-check"/> Mark Done
                             </button>
-                            <PopoverView t-if="activityView.markDonePopoverView" localId="activityView.markDonePopoverView.localId"/>
+                            <PopoverView t-if="activityView.markDonePopoverView" record="activityView.markDonePopoverView"/>
                             <t t-if="activityView.fileUploader">
                                 <button class="o_Activity_toolButton o_Activity_uploadButton btn btn-link btn-primary pt-0 pl-0" t-on-click="activityView.onClickUploadDocument">
                                     <i class="fa fa-upload"/> Upload Document
diff --git a/addons/mail/static/src/components/activity_box/activity_box.js b/addons/mail/static/src/components/activity_box/activity_box.js
index 39c9b6a63c9..474bfbec512 100644
--- a/addons/mail/static/src/components/activity_box/activity_box.js
+++ b/addons/mail/static/src/components/activity_box/activity_box.js
@@ -10,13 +10,13 @@ export class ActivityBox extends Component {
      * @returns {ActivityBoxView}
      */
     get activityBoxView() {
-        return this.messaging && this.messaging.models['ActivityBoxView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ActivityBox, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ActivityBox',
 });
 
diff --git a/addons/mail/static/src/components/activity_box/activity_box.xml b/addons/mail/static/src/components/activity_box/activity_box.xml
index 9a6f4b6d5d5..6319c090c93 100644
--- a/addons/mail/static/src/components/activity_box/activity_box.xml
+++ b/addons/mail/static/src/components/activity_box/activity_box.xml
@@ -34,7 +34,7 @@
                 <t t-if="activityBoxView.isActivityListVisible">
                     <div class="o_ActivityBox_activityList">
                         <t t-foreach="activityBoxView.activityViews" t-as="activityView" t-key="activityView.localId">
-                            <Activity className="'o_ActivityBox_activity'" localId="activityView.localId"/>
+                            <Activity className="'o_ActivityBox_activity'" record="activityView"/>
                         </t>
                     </div>
                 </t>
diff --git a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js
index e96661f2a68..3f9fd1789f6 100644
--- a/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js
+++ b/addons/mail/static/src/components/activity_mark_done_popover_content/activity_mark_done_popover_content.js
@@ -14,8 +14,8 @@ export class ActivityMarkDonePopoverContent extends LegacyComponent {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'ActivityMarkDonePopoverContentView' });
-        useRefToModel({ fieldName: 'feedbackTextareaRef', modelName: 'ActivityMarkDonePopoverContentView', refName: 'feedbackTextarea' });
+        useComponentToModel({ fieldName: 'component' });
+        useRefToModel({ fieldName: 'feedbackTextareaRef', refName: 'feedbackTextarea' });
         this._feedbackTextareaRef = useRef('feedbackTextarea');
         onMounted(() => this._mounted());
     }
@@ -35,13 +35,13 @@ export class ActivityMarkDonePopoverContent extends LegacyComponent {
      * @returns {ActivityMarkDonePopoverContentView}
      */
     get activityMarkDonePopoverContentView() {
-        return this.messaging && this.messaging.models['ActivityMarkDonePopoverContentView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ActivityMarkDonePopoverContent, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ActivityMarkDonePopoverContent',
 });
 
diff --git a/addons/mail/static/src/components/attachment_box/attachment_box.js b/addons/mail/static/src/components/attachment_box/attachment_box.js
index 6e3803b85a9..fc7dda18692 100644
--- a/addons/mail/static/src/components/attachment_box/attachment_box.js
+++ b/addons/mail/static/src/components/attachment_box/attachment_box.js
@@ -12,7 +12,7 @@ export class AttachmentBox extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'AttachmentBoxView' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     //--------------------------------------------------------------------------
@@ -23,13 +23,13 @@ export class AttachmentBox extends Component {
      * @returns {AttachmentBoxView|undefined}
      */
     get attachmentBoxView() {
-        return this.messaging && this.messaging.models['AttachmentBoxView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(AttachmentBox, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentBox',
 });
 
diff --git a/addons/mail/static/src/components/attachment_box/attachment_box.xml b/addons/mail/static/src/components/attachment_box/attachment_box.xml
index 8bc18a0083e..2a03d3fabc7 100644
--- a/addons/mail/static/src/components/attachment_box/attachment_box.xml
+++ b/addons/mail/static/src/components/attachment_box/attachment_box.xml
@@ -15,13 +15,13 @@
                     <t t-if="attachmentBoxView.dropZoneView">
                         <DropZone
                             className="'o_AttachmentBox_dropZone'"
-                            localId="attachmentBoxView.dropZoneView.localId"
+                            record="attachmentBoxView.dropZoneView"
                         />
                     </t>
                     <t t-if="attachmentBoxView.attachmentList">
                         <AttachmentList
                             className="'o_attachmentBox_attachmentList'"
-                            localId="attachmentBoxView.attachmentList.localId"
+                            record="attachmentBoxView.attachmentList"
                         />
                     </t>
                     <button class="o_AttachmentBox_buttonAdd btn btn-link" type="button" t-on-click="attachmentBoxView.onClickAddAttachment">
diff --git a/addons/mail/static/src/components/attachment_card/attachment_card.js b/addons/mail/static/src/components/attachment_card/attachment_card.js
index 95cf73214bf..c68edf64b13 100644
--- a/addons/mail/static/src/components/attachment_card/attachment_card.js
+++ b/addons/mail/static/src/components/attachment_card/attachment_card.js
@@ -10,13 +10,13 @@ export class AttachmentCard extends Component {
      * @returns {AttachmentCard}
      */
     get attachmentCard() {
-        return this.messaging && this.messaging.models['AttachmentCard'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(AttachmentCard, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentCard',
 });
 
diff --git a/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
index f02ea13a173..82cccc40dae 100644
--- a/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
+++ b/addons/mail/static/src/components/attachment_delete_confirm/attachment_delete_confirm.js
@@ -11,20 +11,20 @@ export class AttachmentDeleteConfirm extends Component {
      * @override
      */
     setup() {
-        useComponentToModel({ fieldName: 'component', modelName: 'AttachmentDeleteConfirmView' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     /**
      * @returns {AttachmentDeleteConfirmView}
      */
     get attachmentDeleteConfirmView() {
-        return this.messaging && this.messaging.models['AttachmentDeleteConfirmView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(AttachmentDeleteConfirm, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentDeleteConfirm',
 });
 
diff --git a/addons/mail/static/src/components/attachment_image/attachment_image.js b/addons/mail/static/src/components/attachment_image/attachment_image.js
index 5f3d396c653..14dba97de56 100644
--- a/addons/mail/static/src/components/attachment_image/attachment_image.js
+++ b/addons/mail/static/src/components/attachment_image/attachment_image.js
@@ -10,13 +10,13 @@ export class AttachmentImage extends Component {
      * @returns {AttachmentImage}
      */
     get attachmentImage() {
-        return this.messaging && this.messaging.models['AttachmentImage'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(AttachmentImage, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentImage',
 });
 
diff --git a/addons/mail/static/src/components/attachment_list/attachment_list.js b/addons/mail/static/src/components/attachment_list/attachment_list.js
index 95c5a2e0632..4d6c86deb79 100644
--- a/addons/mail/static/src/components/attachment_list/attachment_list.js
+++ b/addons/mail/static/src/components/attachment_list/attachment_list.js
@@ -10,13 +10,13 @@ export class AttachmentList extends Component {
      * @returns {AttachmentList}
      */
     get attachmentList() {
-        return this.messaging && this.messaging.models['AttachmentList'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(AttachmentList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentList',
 });
 
diff --git a/addons/mail/static/src/components/attachment_list/attachment_list.xml b/addons/mail/static/src/components/attachment_list/attachment_list.xml
index f890e936687..4a26f27482b 100644
--- a/addons/mail/static/src/components/attachment_list/attachment_list.xml
+++ b/addons/mail/static/src/components/attachment_list/attachment_list.xml
@@ -6,12 +6,12 @@
             <div class="o_AttachmentList d-flex flex-column justify-content-start" t-attf-class="{{ className }}" t-ref="root">
                 <div class="o_AttachmentList_partialList o_AttachmentList_partialListImages d-flex flex-grow-1 flex-wrap">
                     <t t-foreach="attachmentList.attachmentImages" t-as="attachmentImage" t-key="attachmentImage.localId">
-                        <AttachmentImage className="'o_AttachmentList_attachment my-1 me-1 mw-100'" localId="attachmentImage.localId"/>
+                        <AttachmentImage className="'o_AttachmentList_attachment my-1 me-1 mw-100'" record="attachmentImage"/>
                     </t>
                 </div>
                 <div class="o_AttachmentList_partialList o_AttachmentList_partialListNonImages d-flex flex-grow-1 flex-wrap justify-content-start m-1">
                     <t t-foreach="attachmentList.attachmentCards" t-as="attachmentCard" t-key="attachmentCard.localId">
-                        <AttachmentCard className="'o_AttachmentList_attachment my-1 me-1 mw-100'" localId="attachmentCard.localId"/>
+                        <AttachmentCard className="'o_AttachmentList_attachment my-1 me-1 mw-100'" record="attachmentCard"/>
                     </t>
                 </div>
             </div>
diff --git a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
index 6940f6e73c8..299a5c0b046 100644
--- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
+++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.js
@@ -18,7 +18,7 @@ export class AttachmentViewer extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'AttachmentViewer' });
+        useComponentToModel({ fieldName: 'component' });
         this.MIN_SCALE = MIN_SCALE;
         /**
          * Used to ensure that the ref is always up to date, which seems to be needed if the element
@@ -79,7 +79,7 @@ export class AttachmentViewer extends Component {
      * @returns {AttachmentViewer}
      */
     get attachmentViewer() {
-        return this.messaging && this.messaging.models['AttachmentViewer'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -347,7 +347,7 @@ export class AttachmentViewer extends Component {
 }
 
 Object.assign(AttachmentViewer, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.AttachmentViewer',
 });
 
diff --git a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js
index d62063705e3..b1ad06234ea 100644
--- a/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js
+++ b/addons/mail/static/src/components/autocomplete_input/autocomplete_input.js
@@ -61,7 +61,7 @@ export class AutocompleteInput extends Component {
      * @returns {AutocompleteInputView}
      */
      get autocompleteInputView() {
-        return this.messaging && this.messaging.models['AutocompleteInputView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -163,7 +163,7 @@ Object.assign(AutocompleteInput, {
             type: Function,
             optional: true,
         },
-        localId: String,
+        record: Object,
         onHide: {
             type: Function,
             optional: true,
diff --git a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
index ae331db8d3a..4cc28cbc935 100644
--- a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
+++ b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.js
@@ -14,19 +14,19 @@ export class ChannelInvitationForm extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'ChannelInvitationForm' });
-        useRefToModel({ fieldName: 'searchInputRef', modelName: 'ChannelInvitationForm', refName: 'searchInput' });
-        useUpdateToModel({ methodName: 'onComponentUpdate', modelName: 'ChannelInvitationForm' });
+        useComponentToModel({ fieldName: 'component' });
+        useRefToModel({ fieldName: 'searchInputRef', refName: 'searchInput' });
+        useUpdateToModel({ methodName: 'onComponentUpdate' });
     }
 
     get channelInvitationForm() {
-        return this.messaging && this.messaging.models['ChannelInvitationForm'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ChannelInvitationForm, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ChannelInvitationForm',
 });
 
diff --git a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.xml b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.xml
index c1cf302eb2c..638c57a3a59 100644
--- a/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.xml
+++ b/addons/mail/static/src/components/channel_invitation_form/channel_invitation_form.xml
@@ -11,7 +11,7 @@
                     </div>
                     <div class="d-flex flex-column flex-grow-1 mx-0 py-2 overflow-auto">
                         <t t-foreach="channelInvitationForm.selectablePartners" t-as="selectablePartner" t-key="selectablePartner.localId">
-                            <ChannelInvitationFormSelectablePartner channelInvitationFormLocalId="channelInvitationForm.localId" selectablePartnerLocalId="selectablePartner.localId"/>
+                            <ChannelInvitationFormSelectablePartner channelInvitationForm="channelInvitationForm" selectablePartner="selectablePartner"/>
                         </t>
                         <t t-if="channelInvitationForm.selectablePartners.length === 0">
                             <div class="mx-3">No user found that is not already a member of this channel.</div>
@@ -27,7 +27,7 @@
                             <h4>Selected users:</h4>
                             <div class="o_ChannelInvitationForm_selectedPartners overflow-auto">
                                 <t t-foreach="channelInvitationForm.selectedPartners" t-as="selectedPartner" t-key="selectedPartner.localId">
-                                    <ChannelInvitationFormSelectedPartner channelInvitationFormLocalId="channelInvitationForm.localId" selectedPartnerLocalId="selectedPartner.localId"/>
+                                    <ChannelInvitationFormSelectedPartner channelInvitationForm="channelInvitationForm" selectedPartner="selectedPartner"/>
                                 </t>
                             </div>
                         </div>
diff --git a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.js b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.js
index f894307dfb2..fba827d0d3b 100644
--- a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.js
+++ b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.js
@@ -10,22 +10,22 @@ export class ChannelInvitationFormSelectablePartner extends Component {
      * @returns {ChannelInvitationForm}
      */
     get channelInvitationForm() {
-        return this.messaging && this.messaging.models['ChannelInvitationForm'].get(this.props.channelInvitationFormLocalId);
+        return this.props.channelInvitationForm;
     }
 
     /**
      * @returns {Partner}
      */
     get selectablePartner() {
-        return this.messaging && this.messaging.models['Partner'].get(this.props.selectablePartnerLocalId);
+        return this.props.selectablePartner;
     }
 
 }
 
 Object.assign(ChannelInvitationFormSelectablePartner, {
     props: {
-        channelInvitationFormLocalId: String,
-        selectablePartnerLocalId: String,
+        channelInvitationForm: Object,
+        selectablePartner: Object,
     },
     template: 'mail.ChannelInvitationFormSelectablePartner',
 });
diff --git a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml
index 15f0b2178bb..4411149d65e 100644
--- a/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml
+++ b/addons/mail/static/src/components/channel_invitation_form_selectable_partner/channel_invitation_form_selectable_partner.xml
@@ -12,7 +12,7 @@
                             'o_ChannelInvitationFormSelectablePartner_imStatusIcon-mobile': messaging.device.isSmall,
                             'small' : !messaging.device.isSmall,
                         }"
-                        partnerLocalId="selectablePartner.localId"
+                        partner="selectablePartner"
                     />
                 </t>
             </div>
diff --git a/addons/mail/static/src/components/channel_invitation_form_selected_partner/channel_invitation_form_selected_partner.js b/addons/mail/static/src/components/channel_invitation_form_selected_partner/channel_invitation_form_selected_partner.js
index 7764aafbb70..1a304717139 100644
--- a/addons/mail/static/src/components/channel_invitation_form_selected_partner/channel_invitation_form_selected_partner.js
+++ b/addons/mail/static/src/components/channel_invitation_form_selected_partner/channel_invitation_form_selected_partner.js
@@ -10,22 +10,22 @@ export class ChannelInvitationFormSelectedPartner extends Component {
      * @returns {ChannelInvitationForm}
      */
     get channelInvitationForm() {
-        return this.messaging && this.messaging.models['ChannelInvitationForm'].get(this.props.channelInvitationFormLocalId);
+        return this.props.channelInvitationForm;
     }
 
     /**
      * @returns {Partner}
      */
     get selectedPartner() {
-        return this.messaging && this.messaging.models['Partner'].get(this.props.selectedPartnerLocalId);
+        return this.props.selectedPartner;
     }
 
 }
 
 Object.assign(ChannelInvitationFormSelectedPartner, {
     props: {
-        channelInvitationFormLocalId: String,
-        selectedPartnerLocalId: String,
+        channelInvitationForm: Object,
+        selectedPartner: Object,
     },
     template: 'mail.ChannelInvitationFormSelectedPartner',
 });
diff --git a/addons/mail/static/src/components/channel_member/channel_member.js b/addons/mail/static/src/components/channel_member/channel_member.js
index d8274fa6cf6..20067057030 100644
--- a/addons/mail/static/src/components/channel_member/channel_member.js
+++ b/addons/mail/static/src/components/channel_member/channel_member.js
@@ -10,22 +10,22 @@ export class ChannelMember extends Component {
      * @returns {Thread}
      */
     get channel() {
-        return this.messaging.models['Thread'].get(this.props.channelLocalId);
+        return this.props.channel;
     }
 
     /**
      * @returns {Partner}
      */
     get member() {
-        return this.messaging.models['Partner'].get(this.props.memberLocalId);
+        return this.props.member;
     }
 
 }
 
 Object.assign(ChannelMember, {
     props: {
-        channelLocalId: String,
-        memberLocalId: String,
+        channel: Object,
+        member: Object,
     },
     template: 'mail.ChannelMember',
 });
diff --git a/addons/mail/static/src/components/channel_member/channel_member.xml b/addons/mail/static/src/components/channel_member/channel_member.xml
index 3e50dea2c58..4f1f7ca3130 100644
--- a/addons/mail/static/src/components/channel_member/channel_member.xml
+++ b/addons/mail/static/src/components/channel_member/channel_member.xml
@@ -13,7 +13,7 @@
                             'o-isDeviceSmall': messaging.device.isSmall,
                             'small': !messaging.device.isSmall,
                         }"
-                        partnerLocalId="member.localId"
+                        partner="member"
                     />
                 </t>
             </div>
diff --git a/addons/mail/static/src/components/channel_member_list/channel_member_list.js b/addons/mail/static/src/components/channel_member_list/channel_member_list.js
index d0c13536b81..23538762039 100644
--- a/addons/mail/static/src/components/channel_member_list/channel_member_list.js
+++ b/addons/mail/static/src/components/channel_member_list/channel_member_list.js
@@ -10,13 +10,13 @@ export class ChannelMemberList extends Component {
      * @returns {ChannelMemberListView}
      */
      get channelMemberListView() {
-        return this.messaging && this.messaging.models['ChannelMemberListView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ChannelMemberList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ChannelMemberList',
 });
 
diff --git a/addons/mail/static/src/components/channel_member_list/channel_member_list.xml b/addons/mail/static/src/components/channel_member_list/channel_member_list.xml
index e24d49d7c1e..767f53667e1 100644
--- a/addons/mail/static/src/components/channel_member_list/channel_member_list.xml
+++ b/addons/mail/static/src/components/channel_member_list/channel_member_list.xml
@@ -34,7 +34,7 @@
     <t t-name="mail.ChannelMemberList_memberList" owl="1">
         <h6 class="m-2"><t t-esc="title"/> - <t t-esc="members.length"/></h6>
         <t t-foreach="members" t-as="member" t-key="member.localId">
-            <ChannelMember channelLocalId="channelMemberListView.channel.localId" memberLocalId="member.localId"/>
+            <ChannelMember channel="channelMemberListView.channel" member="member"/>
         </t>
     </t>
 
diff --git a/addons/mail/static/src/components/chat_window/chat_window.js b/addons/mail/static/src/components/chat_window/chat_window.js
index 7940cadf10f..2d1e560eb5c 100644
--- a/addons/mail/static/src/components/chat_window/chat_window.js
+++ b/addons/mail/static/src/components/chat_window/chat_window.js
@@ -30,7 +30,7 @@ export class ChatWindow extends Component {
      * @returns {ChatWindow}
      */
     get chatWindow() {
-        return this.messaging && this.messaging.models['ChatWindow'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -59,7 +59,7 @@ export class ChatWindow extends Component {
 }
 
 Object.assign(ChatWindow, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ChatWindow',
 });
 
diff --git a/addons/mail/static/src/components/chat_window/chat_window.xml b/addons/mail/static/src/components/chat_window/chat_window.xml
index 20fa6270c34..a82e0d31a17 100644
--- a/addons/mail/static/src/components/chat_window/chat_window.xml
+++ b/addons/mail/static/src/components/chat_window/chat_window.xml
@@ -15,20 +15,20 @@
             >
                 <ChatWindowHeader
                     className="'o_ChatWindow_header flex-grow-0 flex-shrink-0'"
-                    chatWindowLocalId="chatWindow.localId"
-                    localId="chatWindow.chatWindowHeaderView.localId"
+                    chatWindow="chatWindow"
+                    record="chatWindow.chatWindowHeaderView"
                     onClicked="chatWindow.onClickHeader"
                 />
                 <t t-if="chatWindow.channelMemberListView">
-                    <ChannelMemberList localId="chatWindow.channelMemberListView.localId" className="'bg-white'"/>
+                    <ChannelMemberList record="chatWindow.channelMemberListView" className="'bg-white'"/>
                 </t>
                 <t t-if="chatWindow.channelInvitationForm">
-                    <ChannelInvitationForm className="'o_ChatWindow_channelInvitationForm'" localId="chatWindow.channelInvitationForm.localId"/>
+                    <ChannelInvitationForm className="'o_ChatWindow_channelInvitationForm'" record="chatWindow.channelInvitationForm"/>
                 </t>
                 <t t-if="chatWindow.threadView">
                     <ThreadView
                         className="'o_ChatWindow_thread flex-grow-1 flex-shrink-1'"
-                        localId="chatWindow.threadView.localId"
+                        record="chatWindow.threadView"
                     />
                 </t>
                 <t t-if="chatWindow.newMessageAutocompleteInputView">
@@ -38,7 +38,7 @@
                         </span>
                         <AutocompleteInput
                             className="'o_ChatWindow_newMessageFormInput flex-grow-1 flex-shrink-1 border'"
-                            localId="chatWindow.newMessageAutocompleteInputView.localId"
+                            record="chatWindow.newMessageAutocompleteInputView"
                             select="chatWindow.onAutocompleteSelect"
                             source="chatWindow.onAutocompleteSource"
                             inputRef="_inputRef"
diff --git a/addons/mail/static/src/components/chat_window_header/chat_window_header.js b/addons/mail/static/src/components/chat_window_header/chat_window_header.js
index e24b74ac5c9..1cf1ab161c7 100644
--- a/addons/mail/static/src/components/chat_window_header/chat_window_header.js
+++ b/addons/mail/static/src/components/chat_window_header/chat_window_header.js
@@ -15,14 +15,14 @@ export class ChatWindowHeader extends Component {
      * @returns {ChatWindow}
      */
     get chatWindow() {
-        return this.messaging && this.messaging.models['ChatWindow'].get(this.props.chatWindowLocalId);
+        return this.props.chatWindow;
     }
 
     /**
      * @returns {ChatWindowHeaderView}
      */
      get chatWindowHeaderView() {
-        return this.messaging && this.messaging.models['ChatWindowHeaderView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -53,8 +53,8 @@ export class ChatWindowHeader extends Component {
 
 Object.assign(ChatWindowHeader, {
     props: {
-        chatWindowLocalId: String,
-        localId: String,
+        chatWindow: Object,
+        record: Object,
         onClicked: {
             type: Function,
             optional: true,
diff --git a/addons/mail/static/src/components/chat_window_header/chat_window_header.xml b/addons/mail/static/src/components/chat_window_header/chat_window_header.xml
index a2e0a9cd2f8..acf049ceed7 100644
--- a/addons/mail/static/src/components/chat_window_header/chat_window_header.xml
+++ b/addons/mail/static/src/components/chat_window_header/chat_window_header.xml
@@ -12,7 +12,7 @@
                 <t t-if="chatWindow.thread and chatWindow.thread.model === 'mail.channel'">
                     <ThreadIcon
                         className="'o_ChatWindowHeader_icon o_ChatWindowHeader_item ms-3 me-1 my-0'"
-                        threadLocalId="chatWindow.thread.localId"
+                        thread="chatWindow.thread"
                     />
                 </t>
                 <div class="o_ChatWindowHeader_item o_ChatWindowHeader_name mh-100 mx-1 my-0 text-truncate" t-att-class="{'ms-3':!chatWindow.thread or chatWindow.thread.model !== 'mail.channel'}" t-att-title="chatWindow.name">
diff --git a/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml b/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml
index cad74f4b9aa..fef963a5d55 100644
--- a/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml
+++ b/addons/mail/static/src/components/chat_window_hidden_menu/chat_window_hidden_menu.xml
@@ -11,7 +11,7 @@
             </div>
             <ul class="o_ChatWindowHiddenMenu_list dropdown-menu dropdown-menu-right m-0 p-0 overflow-auto" t-att-class="{ show: messaging.chatWindowManager.isHiddenMenuOpen }" role="menu" t-ref="list">
                 <t t-foreach="messaging.chatWindowManager.hiddenChatWindowHeaderViews" t-as="chatWindowHeaderView" t-key="chatWindowHeaderView.localId">
-                    <ChatWindowHiddenMenuItem chatWindowHeaderViewLocalId="chatWindowHeaderView.localId" isLast="chatWindowHeaderView_last"/>
+                    <ChatWindowHiddenMenuItem chatWindowHeaderView="chatWindowHeaderView" isLast="chatWindowHeaderView_last"/>
                 </t>
             </ul>
             <t t-if="messaging.chatWindowManager.unreadHiddenConversationAmount > 0">
diff --git a/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.js b/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.js
index a8ac8d809ab..2a0c6797d14 100644
--- a/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.js
+++ b/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.js
@@ -10,7 +10,7 @@ export class ChatWindowHiddenMenuItem extends Component {
      * @returns {ChatWindowHeaderView}
      */
      get chatWindowHeaderView() {
-        return this.messaging && this.messaging.models['ChatWindowHeaderView'].get(this.props.chatWindowHeaderViewLocalId);
+        return this.props.chatWindowHeaderView;
     }
 }
 
@@ -19,7 +19,7 @@ Object.assign(ChatWindowHiddenMenuItem, {
         isLast: false,
     },
     props: {
-        chatWindowHeaderViewLocalId: String,
+        chatWindowHeaderView: Object,
         isLast: {
             type: Boolean,
             optional: true,
diff --git a/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.xml b/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.xml
index a4b40634498..a5e33bffe88 100644
--- a/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.xml
+++ b/addons/mail/static/src/components/chat_window_hidden_menu_item/chat_window_hidden_menu_item.xml
@@ -5,8 +5,8 @@
         <li class="o_ChatWindowHiddenMenuItem" t-att-class="{ 'border-bottom' : !props.isLast }" role="menuitem" t-attf-class="{{ className }}" t-ref="root">
             <ChatWindowHeader
                 className="'o_ChatWindowHiddenMenuItem_chatWindowHeader opacity-100-hover'"
-                localId="chatWindowHeaderView.localId"
-                chatWindowLocalId="chatWindowHeaderView.chatWindowOwner.localId"
+                record="chatWindowHeaderView"
+                chatWindow="chatWindowHeaderView.chatWindowOwner"
                 onClicked="chatWindowHeaderView.chatWindowOwner.onClickFromChatWindowHiddenMenu"
             />
         </li>
diff --git a/addons/mail/static/src/components/chat_window_manager/chat_window_manager.xml b/addons/mail/static/src/components/chat_window_manager/chat_window_manager.xml
index e6cd82f9ad3..23a53d895a6 100644
--- a/addons/mail/static/src/components/chat_window_manager/chat_window_manager.xml
+++ b/addons/mail/static/src/components/chat_window_manager/chat_window_manager.xml
@@ -9,7 +9,7 @@
                     <ChatWindowHiddenMenu className="'o_ChatWindowManager_hiddenMenu'"/>
                 </t>
                 <t t-foreach="messaging.chatWindowManager.allOrderedVisible" t-as="chatWindow" t-key="chatWindow.localId">
-                    <ChatWindow localId="chatWindow.localId"/>
+                    <ChatWindow record="chatWindow"/>
                 </t>
             </t>
         </div>
diff --git a/addons/mail/static/src/components/chatter/chatter.js b/addons/mail/static/src/components/chatter/chatter.js
index 71b14f4e9eb..9f0cee635b1 100644
--- a/addons/mail/static/src/components/chatter/chatter.js
+++ b/addons/mail/static/src/components/chatter/chatter.js
@@ -14,8 +14,8 @@ export class Chatter extends LegacyComponent {
     setup() {
         super.setup();
         useUpdate({ func: () => this._update() });
-        useComponentToModel({ fieldName: 'component', modelName: 'Chatter' });
-        useRefToModel({ fieldName: 'scrollPanelRef', modelName: 'Chatter', refName: 'scrollPanel' });
+        useComponentToModel({ fieldName: 'component' });
+        useRefToModel({ fieldName: 'scrollPanelRef', refName: 'scrollPanel' });
     }
 
     //--------------------------------------------------------------------------
@@ -26,7 +26,7 @@ export class Chatter extends LegacyComponent {
      * @returns {Chatter}
      */
     get chatter() {
-        return this.messaging && this.messaging.models['Chatter'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -58,7 +58,7 @@ export class Chatter extends LegacyComponent {
 }
 
 Object.assign(Chatter, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Chatter',
 });
 
diff --git a/addons/mail/static/src/components/chatter/chatter.xml b/addons/mail/static/src/components/chatter/chatter.xml
index f5e1a87ef41..304b54d0524 100644
--- a/addons/mail/static/src/components/chatter/chatter.xml
+++ b/addons/mail/static/src/components/chatter/chatter.xml
@@ -7,13 +7,13 @@
                 <div class="o_Chatter_fixedPanel">
                     <ChatterTopbar
                         className="'o_Chatter_topbar'"
-                        localId="chatter.localId"
+                        record="chatter"
                     />
                     <t t-if="chatter.composerView">
                         <Composer
                             className="'o_Chatter_composer border-bottom'"
                             classNameObj="{ 'o-bordered border-left border-right': chatter.hasExternalBorder }"
-                            localId="chatter.composerView.localId"
+                            record="chatter.composerView"
                         />
                     </t>
                 </div>
@@ -21,19 +21,19 @@
                     <t t-if="chatter.attachmentBoxView">
                         <AttachmentBox
                             className="'o_Chatter_attachmentBox'"
-                            localId="chatter.attachmentBoxView.localId"
+                            record="chatter.attachmentBoxView"
                         />
                     </t>
                     <t t-if="chatter.activityBoxView">
                         <ActivityBox
                             className="'o_Chatter_activityBox'"
-                            localId="chatter.activityBoxView.localId"
+                            record="chatter.activityBoxView"
                         />
                     </t>
                     <t t-if="chatter.threadView">
                         <ThreadView
                             className="'o_Chatter_thread'"
-                            localId="chatter.threadView.localId"
+                            record="chatter.threadView"
                         />
                     </t>
                 </div>
diff --git a/addons/mail/static/src/components/chatter_container/chatter_container.xml b/addons/mail/static/src/components/chatter_container/chatter_container.xml
index e8099e97f60..dd88f688a64 100644
--- a/addons/mail/static/src/components/chatter_container/chatter_container.xml
+++ b/addons/mail/static/src/components/chatter_container/chatter_container.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.ChatterContainer" owl="1">
         <div class="o_ChatterContainer flex-grow-1 d-flex w-100" t-attf-class="{{ className }}" data-command-category="mail" t-ref="root">
             <t t-if="chatter">
-                <Chatter localId="chatter.localId"/>
+                <Chatter record="chatter"/>
             </t>
             <t t-else="">
                 <div class="o_ChatterContainer_noChatter flex-grow-1 align-items-center justify-content-center d-flex"><i class="o_ChatterContainer_noChatterIcon fa fa-circle-o-notch fa-spin me-2"/>Please wait...</div>
diff --git a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.js b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.js
index 99a3783ade6..8ba9f13633a 100644
--- a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.js
+++ b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.js
@@ -10,13 +10,13 @@ export class ChatterTopbar extends Component {
      * @returns {Chatter}
      */
     get chatter() {
-        return this.messaging && this.messaging.models['Chatter'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ChatterTopbar, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ChatterTopbar',
 });
 
diff --git a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml
index 4b73538fb4f..181f667371a 100644
--- a/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml
+++ b/addons/mail/static/src/components/chatter_topbar/chatter_topbar.xml
@@ -56,14 +56,14 @@
                                 <t t-if="chatter.followButtonView">
                                     <FollowButton
                                         className="'o_ChatterTopbar_followButton'"
-                                        localId="chatter.followButtonView.localId"
+                                        record="chatter.followButtonView"
                                     />
                                 </t>
                                 <FollowerListMenu
                                     className="'o_ChatterTopbar_followerListMenu'"
                                     isDisabled="chatter.isDisabled"
-                                    localId="chatter.followerListMenuView.localId"
-                                    threadLocalId="chatter.thread.localId"
+                                    record="chatter.followerListMenuView"
+                                    thread="chatter.thread"
                                     isChatterButton="true"
                                 />
                             </t>
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index d04c91db924..f965f437603 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -13,8 +13,8 @@ export class Composer extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'ComposerView' });
-        useRefToModel({ fieldName: 'buttonEmojisRef', modelName: 'ComposerView', refName: 'buttonEmojis' });
+        useComponentToModel({ fieldName: 'component' });
+        useRefToModel({ fieldName: 'buttonEmojisRef', refName: 'buttonEmojis' });
     }
 
     //--------------------------------------------------------------------------
@@ -25,13 +25,13 @@ export class Composer extends Component {
      * @returns {ComposerView}
      */
     get composerView() {
-        return this.messaging && this.messaging.models['ComposerView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(Composer, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Composer',
 });
 
diff --git a/addons/mail/static/src/components/composer/composer.xml b/addons/mail/static/src/components/composer/composer.xml
index e8e6acf7791..f1356af2abf 100644
--- a/addons/mail/static/src/components/composer/composer.xml
+++ b/addons/mail/static/src/components/composer/composer.xml
@@ -20,7 +20,7 @@
                 <t t-if="composerView.dropZoneView">
                     <DropZone
                         className="'o_Composer_dropZone'"
-                        localId="composerView.dropZoneView.localId"
+                        record="composerView.dropZoneView"
                     />
                 </t>
                 <t t-if="composerView.hasHeader">
@@ -48,7 +48,7 @@
                                     </t>
                                 </b>
                             </small>
-                            <ComposerSuggestedRecipientList localId="composerView.composerSuggestedRecipientListView.localId"/>
+                            <ComposerSuggestedRecipientList record="composerView.composerSuggestedRecipientListView"/>
                         </t>
                     </div>
                 </t>
@@ -75,7 +75,7 @@
                             'o_Composer_textInput-mobile': messaging.device.isSmall,
                             'o-has-current-partner-avatar': composerView.hasCurrentPartnerAvatar,
                         }"
-                        localId="composerView.localId"
+                        record="composerView"
                         t-key="composerView.localId"
                     />
                     <div class="o_Composer_buttons" t-att-class="{ 'o-composer-is-compact': composerView.isCompact, 'o-isDeviceSmall': messaging.device.isSmall, 'o-messaging-in-editing': composerView and composerView.messageViewInEditing }">
@@ -99,7 +99,7 @@
                                 >
                                     <i class="fa fa-smile-o"/>
                                 </button>
-                                <PopoverView t-if="composerView.emojisPopoverView" localId="composerView.emojisPopoverView.localId"/>
+                                <PopoverView t-if="composerView.emojisPopoverView" record="composerView.emojisPopoverView"/>
                                 <button class="o_Composer_button o_Composer_buttonAttachment o_Composer_toolButton btn btn-light fa fa-paperclip" t-att-class="{ 'o-isDeviceSmall': messaging.device.isSmall }" title="Add attachment" type="button" t-on-click="composerView.onClickAddAttachment"/>
                             </div>
                             <t t-if="composerView.isExpandable">
@@ -116,13 +116,13 @@
                 <t t-if="composerView.hasFooter">
                     <div class="o_Composer_coreFooter" t-att-class="{ 'o-composer-is-compact': composerView.isCompact }">
                         <t t-if="composerView.hasThreadTyping">
-                            <ThreadTextualTypingStatus className="'o_Composer_threadTextualTypingStatus'" threadLocalId="composerView.composer.activeThread.localId"/>
+                            <ThreadTextualTypingStatus className="'o_Composer_threadTextualTypingStatus'" thread="composerView.composer.activeThread"/>
                         </t>
                         <AttachmentList
                             t-if="composerView.attachmentList"
                             className="'o_Composer_attachmentList'"
                             classNameObj="{ 'o-composer-is-compact': composerView.isCompact }"
-                            localId="composerView.attachmentList.localId"
+                            record="composerView.attachmentList"
                         />
                         <t t-if="!composerView.isCompact">
                             <t t-call="mail.Composer.actionButtons"/>
diff --git a/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js b/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
index d4130989811..327271f1f03 100644
--- a/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
+++ b/addons/mail/static/src/components/composer_suggested_recipient/composer_suggested_recipient.js
@@ -72,7 +72,7 @@ export class ComposerSuggestedRecipient extends Component {
      * @returns {SuggestedRecipientInfo}
      */
     get suggestedRecipientInfo() {
-        return this.messaging && this.messaging.models['SuggestedRecipientInfo'].get(this.props.suggestedRecipientInfoLocalId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -126,9 +126,7 @@ export class ComposerSuggestedRecipient extends Component {
 
 Object.assign(ComposerSuggestedRecipient, {
     components: { FormViewDialogComponentAdapter },
-    props: {
-        suggestedRecipientInfoLocalId: String,
-    },
+    props: { record: Object },
     template: 'mail.ComposerSuggestedRecipient',
 });
 
diff --git a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js
index 2731cc47951..39fc7a95aae 100644
--- a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js
+++ b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.js
@@ -14,13 +14,13 @@ export class ComposerSuggestedRecipientList extends Component {
      * @returns {ComposerSuggestedRecipientListView}
      */
     get composerSuggestedRecipientListView() {
-        return this.messaging && this.messaging.models['ComposerSuggestedRecipientListView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ComposerSuggestedRecipientList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ComposerSuggestedRecipientList',
 });
 
diff --git a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml
index 0e53557703d..47feada4298 100644
--- a/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml
+++ b/addons/mail/static/src/components/composer_suggested_recipient_list/composer_suggested_recipient_list.xml
@@ -4,9 +4,7 @@
         <t t-if="composerSuggestedRecipientListView">
             <div class="o_ComposerSuggestedRecipientList mb-2" t-attf-class="{{ className }}" t-ref="root">
                 <t t-foreach="composerSuggestedRecipientListView.hasShowMoreButton ? composerSuggestedRecipientListView.thread.suggestedRecipientInfoList : composerSuggestedRecipientListView.thread.suggestedRecipientInfoList.slice(0,3)" t-as="recipientInfo" t-key="recipientInfo.localId">
-                    <ComposerSuggestedRecipient
-                        suggestedRecipientInfoLocalId="recipientInfo.localId"
-                    />
+                    <ComposerSuggestedRecipient record="recipientInfo"/>
                 </t>
                 <t t-if="composerSuggestedRecipientListView.thread.suggestedRecipientInfoList.length > 3">
                     <t t-if="!composerSuggestedRecipientListView.hasShowMoreButton" >
diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
index 4a98d7da795..5fb96fefaeb 100644
--- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
+++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.js
@@ -23,7 +23,7 @@ export class ComposerSuggestion extends Component {
      * @returns {ComposerSuggestion}
      */
     get composerSuggestion() {
-        return this.messaging && this.messaging.models['ComposerSuggestion'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -51,7 +51,7 @@ export class ComposerSuggestion extends Component {
 }
 
 Object.assign(ComposerSuggestion, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ComposerSuggestion',
 });
 
diff --git a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml
index ceb867118c7..52f09408570 100644
--- a/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml
+++ b/addons/mail/static/src/components/composer_suggestion/composer_suggestion.xml
@@ -19,7 +19,7 @@
                     <PartnerImStatusIcon
                         className="'o_ComposerSuggestion_partnerImStatusIcon flex-shrink-0 mr-1'"
                         hasBackground="false"
-                        partnerLocalId="composerSuggestion.record.localId"
+                        partner="composerSuggestion.record"
                     />
                     <strong class="o_ComposerSuggestion_part1 flex-shrink-0 mw-100 pr-2 text-truncate"><t t-esc="composerSuggestion.record.nameOrDisplayName"/></strong>
                     <t t-if="composerSuggestion.record.email">
diff --git a/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js b/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js
index 7106bcfc504..b81aafdeea2 100644
--- a/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js
+++ b/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.js
@@ -14,13 +14,13 @@ export class ComposerSuggestionList extends Component {
      * @returns {ComposerSuggestionListView}
      */
     get composerSuggestionListView() {
-        return this.messaging && this.messaging.models['ComposerSuggestionListView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ComposerSuggestionList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ComposerSuggestionList',
 });
 
diff --git a/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.xml b/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.xml
index 510ec1b620d..613cee07d9e 100644
--- a/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.xml
+++ b/addons/mail/static/src/components/composer_suggestion_list/composer_suggestion_list.xml
@@ -7,13 +7,13 @@
                 <div class="o_ComposerSuggestionList_drop w-100" t-att-class="{ 'dropdown': composerSuggestionListView.composerViewOwner.hasMentionSuggestionsBelowPosition, 'dropup': !composerSuggestionListView.composerViewOwner.hasMentionSuggestionsBelowPosition }">
                     <div class="o_ComposerSuggestionList_list dropdown-menu show w-100 overflow-auto">
                         <t t-foreach="composerSuggestionListView.composerViewOwner.mainSuggestions" t-as="suggestion" t-key="suggestion.localId">
-                            <ComposerSuggestion localId="suggestion.localId"/>
+                            <ComposerSuggestion record="suggestion"/>
                         </t>
                         <t t-if="composerSuggestionListView.composerViewOwner.mainSuggestions.length > 0 and composerSuggestionListView.composerViewOwner.extraSuggestions.length > 0">
                             <div role="separator" class="dropdown-divider"/>
                         </t>
                         <t t-foreach="composerSuggestionListView.composerViewOwner.extraSuggestions" t-as="suggestion" t-key="suggestion.localId">
-                            <ComposerSuggestion localId="suggestion.localId"/>
+                            <ComposerSuggestion record="suggestion"/>
                         </t>
                     </div>
                 </div>
diff --git a/addons/mail/static/src/components/composer_text_input/composer_text_input.js b/addons/mail/static/src/components/composer_text_input/composer_text_input.js
index 161d3957bb6..0e9a580b21f 100644
--- a/addons/mail/static/src/components/composer_text_input/composer_text_input.js
+++ b/addons/mail/static/src/components/composer_text_input/composer_text_input.js
@@ -13,8 +13,8 @@ export class ComposerTextInput extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'mirroredTextareaRef', modelName: 'ComposerView', refName: 'mirroredTextarea' });
-        useRefToModel({ fieldName: 'textareaRef', modelName: 'ComposerView', refName: 'textarea' });
+        useRefToModel({ fieldName: 'mirroredTextareaRef', refName: 'mirroredTextarea' });
+        useRefToModel({ fieldName: 'textareaRef', refName: 'textarea' });
         /**
          * Updates the composer text input content when composer is mounted
          * as textarea content can't be changed from the DOM.
@@ -30,7 +30,7 @@ export class ComposerTextInput extends Component {
      * @returns {ComposerView}
      */
     get composerView() {
-        return this.messaging && this.messaging.models['ComposerView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -112,7 +112,7 @@ export class ComposerTextInput extends Component {
 }
 
 Object.assign(ComposerTextInput, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ComposerTextInput',
 });
 
diff --git a/addons/mail/static/src/components/composer_text_input/composer_text_input.xml b/addons/mail/static/src/components/composer_text_input/composer_text_input.xml
index e21cec74ef3..bc469088ff0 100644
--- a/addons/mail/static/src/components/composer_text_input/composer_text_input.xml
+++ b/addons/mail/static/src/components/composer_text_input/composer_text_input.xml
@@ -5,7 +5,7 @@
         <t t-if="composerView">
             <div class="o_ComposerTextInput" t-attf-class="{{ className }}" t-on-paste="composerView.onPasteTextInput" t-ref="root">
                 <t t-if="composerView.composerSuggestionListView">
-                    <ComposerSuggestionList localId="composerView.composerSuggestionListView.localId"/>
+                    <ComposerSuggestionList record="composerView.composerSuggestionListView"/>
                 </t>
                 <textarea class="o_ComposerTextInput_textarea o_ComposerTextInput_textareaStyle" t-att-class="{ 'o-composer-is-compact': composerView.isCompact }" t-esc="composerView.composer.textInputContent" t-att-placeholder="composerView.composer.placeholder" t-on-click="composerView.onClickTextarea" t-on-focusin="composerView.onFocusinTextarea" t-on-focusout="composerView.onFocusoutTextarea" t-on-keydown="composerView.onKeydownTextarea" t-on-keyup="composerView.onKeyupTextarea" t-on-input="_onInputTextarea" t-ref="textarea"/>
                 <!--
diff --git a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
index d84af6bd765..55e50653a51 100644
--- a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
+++ b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.js
@@ -12,20 +12,20 @@ export class DeleteMessageConfirm extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'DeleteMessageConfirmView' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     /**
      * @returns {DeleteMessageConfirmView}
      */
     get deleteMessageConfirmView() {
-        return this.messaging && this.messaging.models['DeleteMessageConfirmView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(DeleteMessageConfirm, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DeleteMessageConfirm',
 });
 
diff --git a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml
index be60968262b..dbd86fd1ced 100644
--- a/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml
+++ b/addons/mail/static/src/components/delete_message_confirm/delete_message_confirm.xml
@@ -7,7 +7,7 @@
                 <hr class="mt-0 mb-3"/>
                 <p class="mx-3 mb-3">Are you sure you want to delete this message?</p>
                 <blockquote class="o_DeleteMessageConfirm_blockquote mx-3 mb-3 fst-normal">
-                    <Message localId="deleteMessageConfirmView.messageView.localId"/>
+                    <Message record="deleteMessageConfirmView.messageView"/>
                 </blockquote>
                 <small t-if="!deleteMessageConfirmView.message.originThread or deleteMessageConfirmView.message.originThread.model !== 'mail.channel'" class="mx-3 mb-3">Pay attention: The followers of this document who were notified by email will still be able to read the content of this message and reply to it.</small>
                 <hr class="mt-0 mb-3"/>
diff --git a/addons/mail/static/src/components/dialog/dialog.js b/addons/mail/static/src/components/dialog/dialog.js
index 7956a9bb4f0..cccc36bd76b 100644
--- a/addons/mail/static/src/components/dialog/dialog.js
+++ b/addons/mail/static/src/components/dialog/dialog.js
@@ -14,13 +14,13 @@ export class Dialog extends Component {
      * @returns {Dialog}
      */
     get dialog() {
-        return this.messaging && this.messaging.models['Dialog'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(Dialog, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Dialog',
 });
 
diff --git a/addons/mail/static/src/components/dialog/dialog.xml b/addons/mail/static/src/components/dialog/dialog.xml
index 2565132e997..454d46bdf64 100644
--- a/addons/mail/static/src/components/dialog/dialog.xml
+++ b/addons/mail/static/src/components/dialog/dialog.xml
@@ -8,7 +8,7 @@
                     t-component="constructor.components[dialog.componentName]"
                     t-props="{
                         className: `o_Dialog_component ${dialog.componentClassName}`,
-                        localId: dialog.record.localId,
+                        record: dialog.record,
                     }"
                 />
             </div>
diff --git a/addons/mail/static/src/components/dialog_manager/dialog_manager.xml b/addons/mail/static/src/components/dialog_manager/dialog_manager.xml
index 5a02e610597..85fc6bf8c7c 100644
--- a/addons/mail/static/src/components/dialog_manager/dialog_manager.xml
+++ b/addons/mail/static/src/components/dialog_manager/dialog_manager.xml
@@ -7,7 +7,7 @@
                 <t t-foreach="messaging.dialogManager.dialogs" t-as="dialog" t-key="dialog.localId">
                     <Dialog
                         className="'o_DialogManager_dialog'"
-                        localId="dialog.localId"
+                        record="dialog"
                     />
                 </t>
             </t>
diff --git a/addons/mail/static/src/components/discuss/discuss.js b/addons/mail/static/src/components/discuss/discuss.js
index 089def068d8..f8cb2b9c424 100644
--- a/addons/mail/static/src/components/discuss/discuss.js
+++ b/addons/mail/static/src/components/discuss/discuss.js
@@ -42,7 +42,7 @@ export class Discuss extends LegacyComponent {
      * @returns {DiscussView}
      */
     get discussView() {
-        return this.messaging && this.messaging.models['DiscussView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -79,7 +79,7 @@ export class Discuss extends LegacyComponent {
 }
 
 Object.assign(Discuss, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Discuss',
 });
 
diff --git a/addons/mail/static/src/components/discuss/discuss.xml b/addons/mail/static/src/components/discuss/discuss.xml
index 61f31678a67..902232186b1 100644
--- a/addons/mail/static/src/components/discuss/discuss.xml
+++ b/addons/mail/static/src/components/discuss/discuss.xml
@@ -8,7 +8,7 @@
                 t-ref="root"
             >
                 <t t-if="!messaging.device.isSmall">
-                    <DiscussSidebar className="'o_Discuss_sidebar bg-light border-right'" localId="discussView.localId"/>
+                    <DiscussSidebar className="'o_Discuss_sidebar bg-light border-right'" record="discussView"/>
                 </t>
                 <t t-if="messaging.device.isSmall" t-call="mail.Discuss.content"/>
                 <t t-else="">
@@ -22,13 +22,13 @@
 
     <t t-name="mail.Discuss.content" owl="1">
         <t t-if="messaging.device.isSmall and discussView.discuss.activeMobileNavbarTabId === 'mailbox'">
-            <DiscussMobileMailboxSelection className="'o_Discuss_mobileMailboxSelection border-bottom'" localId="discussView.localId"/>
+            <DiscussMobileMailboxSelection className="'o_Discuss_mobileMailboxSelection border-bottom'" record="discussView"/>
         </t>
         <t t-if="discussView.mobileAddItemHeaderAutocompleteInputView">
             <div class="o_Discuss_mobileAddItemHeader border-bottom">
                 <AutocompleteInput
                     className="'o_Discuss_mobileAddItemHeaderInput'"
-                    localId="discussView.mobileAddItemHeaderAutocompleteInputView.localId"
+                    record="discussView.mobileAddItemHeaderAutocompleteInputView"
                     select="discussView.onMobileAddItemHeaderInputSelect"
                     source="discussView.onMobileAddItemHeaderInputSource"
                     onHide="discussView.onHideMobileAddItemHeader"
@@ -40,7 +40,7 @@
             <ThreadView
                 className="'o_Discuss_thread'"
                 classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }"
-                localId="discussView.discuss.threadView.localId"
+                record="discussView.discuss.threadView"
             />
         </t>
         <t t-if="!discussView.discuss.thread and (!messaging.device.isSmall or discussView.discuss.activeMobileNavbarTabId === 'mailbox')">
@@ -61,12 +61,12 @@
             </t>
         </t>
         <t t-if="discussView.discuss.notificationListView">
-            <NotificationList className="'o_Discuss_notificationList'" localId="discussView.discuss.notificationListView.localId"/>
+            <NotificationList className="'o_Discuss_notificationList'" record="discussView.discuss.notificationListView"/>
         </t>
         <t t-if="discussView.discuss.mobileMessagingNavbarView">
             <MobileMessagingNavbar
                 className="'o_Discuss_mobileNavbar'"
-                localId="discussView.discuss.mobileMessagingNavbarView.localId"
+                record="discussView.discuss.mobileMessagingNavbarView"
             />
         </t>
     </t>
diff --git a/addons/mail/static/src/components/discuss_container/discuss_container.xml b/addons/mail/static/src/components/discuss_container/discuss_container.xml
index f5e24bb8f03..c5c14450413 100644
--- a/addons/mail/static/src/components/discuss_container/discuss_container.xml
+++ b/addons/mail/static/src/components/discuss_container/discuss_container.xml
@@ -3,7 +3,7 @@
 
     <t t-name="mail.DiscussContainer" owl="1">
         <div class="o_DiscussContainer d-flex flex-grow-1 flex-column">
-            <Discuss t-if="messaging and messaging.discuss and messaging.discuss.discussView and messaging.isInitialized" className="'flex-grow-1'" localId="messaging.discuss.discussView.localId"/>
+            <Discuss t-if="messaging and messaging.discuss and messaging.discuss.discussView and messaging.isInitialized" className="'flex-grow-1'" record="messaging.discuss.discussView"/>
             <div t-else="" class="o_DiscussContainer_spinner d-flex flex-grow-1 align-items-center justify-content-center">
                 <i class="o_DiscussContainer_spinnerIcon fa fa-circle-o-notch fa-spin me-2"/>Please wait...
             </div>
diff --git a/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js b/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js
index 5ae63339ba5..6bed1319b8e 100644
--- a/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js
+++ b/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.js
@@ -14,13 +14,13 @@ export class DiscussMobileMailboxSelection extends Component {
      * @returns {DiscussView}
      */
     get discussView() {
-        return this.messaging && this.messaging.models['DiscussView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(DiscussMobileMailboxSelection, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussMobileMailboxSelection',
 });
 
diff --git a/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml b/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml
index 6f1e0f40674..445b174694a 100644
--- a/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml
+++ b/addons/mail/static/src/components/discuss_mobile_mailbox_selection/discuss_mobile_mailbox_selection.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.DiscussMobileMailboxSelection" owl="1">
         <div class="o_DiscussMobileMailboxSelection d-flex" t-attf-class="{{ className }}" t-ref="root">
             <t t-foreach="discussView.discuss.orderedMailboxes" t-as="mailbox" t-key="mailbox.localId">
-                <DiscussMobileMailboxSelectionItem discussViewLocalId="discussView.localId" mailboxLocalId="mailbox.localId"/>
+                <DiscussMobileMailboxSelectionItem discussView="discussView" mailbox="mailbox"/>
             </t>
         </div>
     </t>
diff --git a/addons/mail/static/src/components/discuss_mobile_mailbox_selection_item/discuss_mobile_mailbox_selection_item.js b/addons/mail/static/src/components/discuss_mobile_mailbox_selection_item/discuss_mobile_mailbox_selection_item.js
index 79bcf7640d6..788e238b88a 100644
--- a/addons/mail/static/src/components/discuss_mobile_mailbox_selection_item/discuss_mobile_mailbox_selection_item.js
+++ b/addons/mail/static/src/components/discuss_mobile_mailbox_selection_item/discuss_mobile_mailbox_selection_item.js
@@ -14,22 +14,22 @@ export class DiscussMobileMailboxSelectionItem extends Component {
      * @returns {DiscussView}
      */
     get discussView() {
-        return this.messaging && this.messaging.models['DiscussView'].get(this.props.discussViewLocalId);
+        return this.props.discussView;
     }
 
     /**
      * @returns {Thread}
      */
     get mailbox() {
-        return this.messaging && this.messaging.models['Thread'].get(this.props.mailboxLocalId);
+        return this.props.mailbox;
     }
 
 }
 
 Object.assign(DiscussMobileMailboxSelectionItem, {
     props: {
-        discussViewLocalId: String,
-        mailboxLocalId: String,
+        discussView: Object,
+        mailbox: Object,
     },
     template: 'mail.DiscussMobileMailboxSelectionItem',
 });
diff --git a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js
index c4f8a6f1454..cf3e9be2b29 100644
--- a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js
+++ b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.js
@@ -10,12 +10,12 @@ class DiscussPublicView extends Component {
      * @returns {DiscussPublicView}
      */
      get discussPublicView() {
-        return this.messaging && this.messaging.models['DiscussPublicView'].get(this.props.localId);
+        return this.props.record;
     }
 }
 
 Object.assign(DiscussPublicView, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussPublicView',
 });
 
diff --git a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.xml b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.xml
index f606b09affc..3d1fb1aeb23 100644
--- a/addons/mail/static/src/components/discuss_public_view/discuss_public_view.xml
+++ b/addons/mail/static/src/components/discuss_public_view/discuss_public_view.xml
@@ -4,10 +4,10 @@
         <t t-if="discussPublicView">
             <div class="o_DiscussPublicView d-flex flex-column h-100" t-attf-class="{{ className }}" t-ref="root">
                 <ThreadView t-if="discussPublicView.threadView"
-                    localId="discussPublicView.threadView.localId"
+                    record="discussPublicView.threadView"
                 />
                 <WelcomeView t-if="discussPublicView.welcomeView"
-                    localId="discussPublicView.welcomeView.localId"
+                    record="discussPublicView.welcomeView"
                 />
             </div>
         </t>
diff --git a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
index a1911358437..aa35a392a21 100644
--- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
+++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
@@ -14,7 +14,7 @@ export class DiscussSidebar extends Component {
     setup() {
         super.setup();
         useUpdate({ func: () => this._update() });
-        useRefToModel({ fieldName: 'quickSearchInputRef', modelName: 'DiscussView', refName: 'quickSearchInput' });
+        useRefToModel({ fieldName: 'quickSearchInputRef', refName: 'quickSearchInput' });
     }
 
     //--------------------------------------------------------------------------
@@ -25,7 +25,7 @@ export class DiscussSidebar extends Component {
      * @returns {DiscussView}
      */
     get discussView() {
-        return this.messaging && this.messaging.models['DiscussView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -47,7 +47,7 @@ export class DiscussSidebar extends Component {
 }
 
 Object.assign(DiscussSidebar, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussSidebar',
 });
 
diff --git a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml
index 964566d4efd..cdaa1b72f28 100644
--- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml
+++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.xml
@@ -11,9 +11,9 @@
                 </div>
                 <hr class="o_DiscussSidebar_separator"/>
                 <div class="o_DiscussSidebar_category o_DiscussSidebar_categoryMailbox">
-                    <DiscussSidebarMailbox localId="discussView.inboxView.localId"/>
-                    <DiscussSidebarMailbox localId="discussView.starredView.localId"/>
-                    <DiscussSidebarMailbox localId="discussView.historyView.localId"/>
+                    <DiscussSidebarMailbox record="discussView.inboxView"/>
+                    <DiscussSidebarMailbox record="discussView.starredView"/>
+                    <DiscussSidebarMailbox record="discussView.historyView"/>
                 </div>
                 <hr class="o_DiscussSidebar_separator"/>
                 <t t-if="messaging.models['Thread'].all(thread => thread.isPinned and thread.model === 'mail.channel').length > 19">
@@ -22,13 +22,13 @@
                 <DiscussSidebarCategory
                     t-if="discussView.discuss.categoryChannel"
                     className="'o_DiscussSidebar_category o_DiscussSidebar_categoryChannel'"
-                    localId="discussView.discuss.categoryChannel.localId"
+                    record="discussView.discuss.categoryChannel"
                 />
                 <t name="beforeCategoryChat"/>
                 <DiscussSidebarCategory
                     t-if="discussView.discuss.categoryChat"
                     className="'o_DiscussSidebar_category o_DiscussSidebar_categoryChat'"
-                    localId="discussView.discuss.categoryChat.localId"
+                    record="discussView.discuss.categoryChat"
                 />
             </div>
         </t>
diff --git a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.js b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.js
index 52bb59200da..94bf9e5f2d1 100644
--- a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.js
+++ b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.js
@@ -10,12 +10,12 @@ export class DiscussSidebarCategory extends Component {
      * @returns {DiscussSidebarCategory}
      */
     get category() {
-        return this.messaging && this.messaging.models['DiscussSidebarCategory'].get(this.props.localId);
+        return this.props.record;
     }
 }
 
 Object.assign(DiscussSidebarCategory, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussSidebarCategory',
 });
 
diff --git a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml
index b8a3ee03c71..8aa0f62cd5e 100644
--- a/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml
+++ b/addons/mail/static/src/components/discuss_sidebar_category/discuss_sidebar_category.xml
@@ -30,7 +30,7 @@
                             <div class="o_DiscussSidebarCategory_addingItem d-flex mb-2">
                                 <AutocompleteInput
                                     className="'o_DiscussSidebarCategory_addingItemInput flex-grow-1'"
-                                    localId="category.addingItemAutocompleteInputView.localId"
+                                    record="category.addingItemAutocompleteInputView"
                                     select="category.onAddItemAutocompleteSelect"
                                     source="category.onAddItemAutocompleteSource"
                                     onHide="category.onHideAddingItem"
@@ -40,14 +40,14 @@
                         <t t-foreach="category.filteredCategoryItems" t-as="item" t-key="item.localId">
                             <DiscussSidebarCategoryItem
                                 className="'o_DiscussSidebarCategory_item'"
-                                localId="item.localId"
+                                record="item"
                             />
                         </t>
                     </t>
                     <t t-if="!category.isOpen and category.activeItem">
                         <DiscussSidebarCategoryItem
                             className="'o_DiscussSidebarCategory_item'"
-                            localId="category.activeItem.localId"
+                            record="category.activeItem"
                         />
                     </t>
                 </div>
diff --git a/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.js b/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.js
index 58fa6320c1f..eec8df295e2 100644
--- a/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.js
+++ b/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.js
@@ -10,13 +10,13 @@ export class DiscussSidebarCategoryItem extends Component {
      * @returns {DiscussSidebarCategoryItem}
      */
     get categoryItem() {
-        return this.messaging.models['DiscussSidebarCategoryItem'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(DiscussSidebarCategoryItem, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussSidebarCategoryItem',
 });
 
diff --git a/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.xml b/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.xml
index e2de6b0b20d..cab7436cd80 100644
--- a/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.xml
+++ b/addons/mail/static/src/components/discuss_sidebar_category_item/discuss_sidebar_category_item.xml
@@ -13,7 +13,7 @@
                     <div class="o_DiscussSidebarCategoryItem_imageContainer">
                         <img class="o_DiscussSidebarCategoryItem_image rounded-circle" t-att-src="categoryItem.avatarUrl" alt="Thread Image"/>
                         <t t-if="categoryItem.hasThreadIcon">
-                            <ThreadIcon className="'o_DiscussSidebarCategoryItem_threadIcon'" threadLocalId="categoryItem.channel.localId"/>
+                            <ThreadIcon className="'o_DiscussSidebarCategoryItem_threadIcon'" thread="categoryItem.channel"/>
                         </t>
                     </div>
                 </div>
diff --git a/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.js b/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.js
index 2a3ec29c1bb..7536f7ad301 100644
--- a/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.js
+++ b/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.js
@@ -10,13 +10,13 @@ export class DiscussSidebarMailbox extends Component {
      * @returns {DiscussSidebarMailboxView}
      */
     get discussSidebarMailboxView() {
-        return this.messaging && this.messaging.models['DiscussSidebarMailboxView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(DiscussSidebarMailbox, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.DiscussSidebarMailbox',
 });
 
diff --git a/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.xml b/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.xml
index a17bede5226..a3b5472eb0b 100644
--- a/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.xml
+++ b/addons/mail/static/src/components/discuss_sidebar_mailbox/discuss_sidebar_mailbox.xml
@@ -8,7 +8,7 @@
             }" t-attf-class="{{ className }}" t-on-click="discussSidebarMailboxView.mailbox.onClick" t-att-data-thread-local-id="discussSidebarMailboxView.mailbox.localId" t-att-data-thread-name="discussSidebarMailboxView.mailbox.displayName"
             t-ref="root"
         >
-            <ThreadIcon className="'o_DiscussSidebarMailbox_item'" threadLocalId="discussSidebarMailboxView.mailbox.localId"/>
+            <ThreadIcon className="'o_DiscussSidebarMailbox_item'" thread="discussSidebarMailboxView.mailbox"/>
             <div class="o_DiscussSidebarMailbox_item o_DiscussSidebarMailbox_name">
                 <t t-esc="discussSidebarMailboxView.mailbox.displayName"/>
             </div>
diff --git a/addons/mail/static/src/components/drop_zone/drop_zone.js b/addons/mail/static/src/components/drop_zone/drop_zone.js
index d88fb486076..c1979ac6488 100644
--- a/addons/mail/static/src/components/drop_zone/drop_zone.js
+++ b/addons/mail/static/src/components/drop_zone/drop_zone.js
@@ -14,7 +14,7 @@ export class DropZone extends Component {
      * @returns {DropZoneView}
      */
     get dropZoneView() {
-        return this.messaging && this.messaging.models['DropZoneView'].get(this.props.localId);
+        return this.props.record;
     }
 
     /**
@@ -31,7 +31,7 @@ export class DropZone extends Component {
 
 Object.assign(DropZone, {
     props: {
-        localId: String,
+        record: Object,
         onDropzoneFilesDropped: {
             type: Function,
             optional: true,
diff --git a/addons/mail/static/src/components/emoji/emoji.js b/addons/mail/static/src/components/emoji/emoji.js
index 93206cd4879..f8aed3ac368 100644
--- a/addons/mail/static/src/components/emoji/emoji.js
+++ b/addons/mail/static/src/components/emoji/emoji.js
@@ -10,7 +10,7 @@ export class Emoji extends Component {
      * @returns {EmojiListView}
      */
     get emojiListView() {
-        return this.messaging && this.messaging.models['EmojiListView'].get(this.props.emojiListViewLocalId);
+        return this.props.emojiListView;
     }
 
 }
@@ -18,7 +18,7 @@ export class Emoji extends Component {
 Object.assign(Emoji, {
     props: {
         emoji: Object,
-        emojiListViewLocalId: String,
+        emojiListView: Object,
     },
     template: 'mail.Emoji',
 });
diff --git a/addons/mail/static/src/components/emoji_list/emoji_list.js b/addons/mail/static/src/components/emoji_list/emoji_list.js
index 1f28a3e659b..c64c048026f 100644
--- a/addons/mail/static/src/components/emoji_list/emoji_list.js
+++ b/addons/mail/static/src/components/emoji_list/emoji_list.js
@@ -17,7 +17,7 @@ export class EmojiList extends LegacyComponent {
     }
 
     get emojiListView() {
-        return this.messaging && this.messaging.models['EmojiListView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -52,7 +52,7 @@ export class EmojiList extends LegacyComponent {
 }
 
 Object.assign(EmojiList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.EmojiList',
 });
 
diff --git a/addons/mail/static/src/components/emoji_list/emoji_list.xml b/addons/mail/static/src/components/emoji_list/emoji_list.xml
index 1c3ec550593..294d72b2d9c 100644
--- a/addons/mail/static/src/components/emoji_list/emoji_list.xml
+++ b/addons/mail/static/src/components/emoji_list/emoji_list.xml
@@ -5,7 +5,7 @@
         <div class="o_EmojiList" t-attf-class="{{ className }}" t-ref="root">
             <t t-if="emojiListView">
                 <t t-foreach="emojis" t-as="emoji" t-key="emoji.unicode">
-                    <Emoji emoji="emoji" emojiListViewLocalId="emojiListView.localId"/>
+                    <Emoji emoji="emoji" emojiListView="emojiListView"/>
                 </t>
             </t>
         </div>
diff --git a/addons/mail/static/src/components/follow_button/follow_button.js b/addons/mail/static/src/components/follow_button/follow_button.js
index 0b4b3d0c929..76fb22611cf 100644
--- a/addons/mail/static/src/components/follow_button/follow_button.js
+++ b/addons/mail/static/src/components/follow_button/follow_button.js
@@ -14,13 +14,13 @@ export class FollowButton extends Component {
      * @return {FollowButtonView}
      */
     get followButtonView() {
-        return this.messaging && this.messaging.models['FollowButtonView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(FollowButton, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.FollowButton',
 });
 
diff --git a/addons/mail/static/src/components/follower/follower.js b/addons/mail/static/src/components/follower/follower.js
index 2c25056a878..123e4772da5 100644
--- a/addons/mail/static/src/components/follower/follower.js
+++ b/addons/mail/static/src/components/follower/follower.js
@@ -14,7 +14,7 @@ export class Follower extends Component {
      * @returns {Follower}
      */
     get follower() {
-        return this.messaging && this.messaging.models['Follower'].get(this.props.followerLocalId);
+        return this.props.follower;
     }
 
 }
@@ -24,7 +24,7 @@ Object.assign(Follower, {
         onClick: () => {},
     },
     props: {
-        followerLocalId: String,
+        follower: Object,
         onClick: {
             type: Function,
             optional: true,
diff --git a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js
index defb2145d70..ccc6b680fdc 100644
--- a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js
+++ b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.js
@@ -33,14 +33,14 @@ export class FollowerListMenu extends Component {
      * @return {FollowerListMenuView}
      */
     get followerListMenuView() {
-        return this.messaging && this.messaging.models['FollowerListMenuView'].get(this.props.localId);
+        return this.props.record;
     }
 
     /**
      * @return {Thread}
      */
     get thread() {
-        return this.messaging && this.messaging.models['Thread'].get(this.props.threadLocalId);
+        return this.props.thread;
     }
 
     //--------------------------------------------------------------------------
@@ -79,9 +79,9 @@ Object.assign(FollowerListMenu, {
     },
     props: {
         isDisabled: { type: Boolean, optional: true },
-        threadLocalId: String,
+        thread: Object,
         isChatterButton: { type: Boolean, optional: true },
-        localId: String,
+        record: Object,
     },
     template: 'mail.FollowerListMenu',
 });
diff --git a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.xml b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.xml
index 9a2a0e7a256..817b4eee33f 100644
--- a/addons/mail/static/src/components/follower_list_menu/follower_list_menu.xml
+++ b/addons/mail/static/src/components/follower_list_menu/follower_list_menu.xml
@@ -24,7 +24,7 @@
                                 <Follower
                                     t-foreach="thread.followers" t-as="follower" t-key="follower.localId"
                                     className="'o_FollowerMenu_follower dropdown-item'"
-                                    followerLocalId="follower.localId"
+                                    follower="follower"
                                     onClick="followerListMenuView.onClickFollower"
                                 />
                             </t>
diff --git a/addons/mail/static/src/components/follower_subtype/follower_subtype.js b/addons/mail/static/src/components/follower_subtype/follower_subtype.js
index d53b8d63ce9..f079d09b3f3 100644
--- a/addons/mail/static/src/components/follower_subtype/follower_subtype.js
+++ b/addons/mail/static/src/components/follower_subtype/follower_subtype.js
@@ -14,13 +14,13 @@ export class FollowerSubtype extends Component {
      * @returns {FollowerSubtypeView}
      */
     get followerSubtypeView() {
-        return this.messaging && this.messaging.models['FollowerSubtypeView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(FollowerSubtype, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.FollowerSubtype',
 });
 
diff --git a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
index 4c6c210103c..e4c51424ccf 100644
--- a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
+++ b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.js
@@ -12,7 +12,7 @@ export class FollowerSubtypeList extends Component {
      */
      setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'FollowerSubtypeList' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     //--------------------------------------------------------------------------
@@ -23,13 +23,13 @@ export class FollowerSubtypeList extends Component {
      * @returns {FollowerSubtypeList}
      */
     get followerSubtypeList() {
-        return this.messaging && this.messaging.models['FollowerSubtypeList'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(FollowerSubtypeList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.FollowerSubtypeList',
 });
 
diff --git a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.xml b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.xml
index 5fb89754666..22a28aa8c14 100644
--- a/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.xml
+++ b/addons/mail/static/src/components/follower_subtype_list/follower_subtype_list.xml
@@ -16,7 +16,7 @@
                             <t t-foreach="followerSubtypeList.followerSubtypeViews" t-as="followerSubtypeView" t-key="followerSubtypeView.localId">
                                 <FollowerSubtype
                                     className="'o_FollowerSubtypeList_subtype'"
-                                    localId="followerSubtypeView.localId"
+                                    record="followerSubtypeView"
                                 />
                             </t>
                         </div>
diff --git a/addons/mail/static/src/components/mail_template/mail_template.js b/addons/mail/static/src/components/mail_template/mail_template.js
index ddd3110e339..9821659e839 100644
--- a/addons/mail/static/src/components/mail_template/mail_template.js
+++ b/addons/mail/static/src/components/mail_template/mail_template.js
@@ -14,13 +14,13 @@ export class MailTemplate extends Component {
      * @returns {MailTemplateView}
      */
     get mailTemplateView() {
-        return this.messaging && this.messaging.models['MailTemplateView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MailTemplate, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MailTemplate',
 });
 
diff --git a/addons/mail/static/src/components/media_preview/media_preview.js b/addons/mail/static/src/components/media_preview/media_preview.js
index f53670fa1ca..45be5fab473 100644
--- a/addons/mail/static/src/components/media_preview/media_preview.js
+++ b/addons/mail/static/src/components/media_preview/media_preview.js
@@ -12,20 +12,20 @@ export class MediaPreview extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'audioRef', modelName: 'MediaPreview', refName: 'audio' });
-        useRefToModel({ fieldName: 'videoRef', modelName: 'MediaPreview', refName: 'video' });
+        useRefToModel({ fieldName: 'audioRef', refName: 'audio' });
+        useRefToModel({ fieldName: 'videoRef', refName: 'video' });
     }
 
     /**
      * @returns {MediaPreview}
      */
     get mediaPreview() {
-        return this.messaging && this.messaging.models['MediaPreview'].get(this.props.localId);
+        return this.props.record;
     }
 }
 
 Object.assign(MediaPreview, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MediaPreview',
 });
 
diff --git a/addons/mail/static/src/components/message/message.js b/addons/mail/static/src/components/message/message.js
index 78a9ca53152..e98aec87d70 100644
--- a/addons/mail/static/src/components/message/message.js
+++ b/addons/mail/static/src/components/message/message.js
@@ -20,8 +20,8 @@ export class Message extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'MessageView' });
-        useUpdateToModel({ methodName: 'onComponentUpdate', modelName: 'MessageView' });
+        useComponentToModel({ fieldName: 'component' });
+        useUpdateToModel({ methodName: 'onComponentUpdate' });
         useUpdate({ func: () => this._update() });
         /**
          * Value of the last rendered prettyBody. Useful to compare to new value
@@ -120,7 +120,7 @@ export class Message extends Component {
      * @returns {MessageView}
      */
     get messageView() {
-        return this.messaging && this.messaging.models['MessageView'].get(this.props.localId);
+        return this.props.record;
     }
 
     /**
@@ -277,7 +277,7 @@ export class Message extends Component {
 }
 
 Object.assign(Message, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.Message',
     components: { Popover },
 });
diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml
index 2ad52b5850c..95145bbe74e 100644
--- a/addons/mail/static/src/components/message/message.xml
+++ b/addons/mail/static/src/components/message/message.xml
@@ -25,9 +25,9 @@
                 }" t-attf-class="{{ messageView.extraClass }} {{ className }}" t-on-click="messageView.onClick" t-on-mouseenter="messageView.onMouseenter" t-on-mouseleave="messageView.onMouseleave" t-att-data-message-local-id="messageView.message.localId"
                 t-ref="root"
             >
-                <MessageInReplyToView t-if="messageView.messageInReplyToView" localId="messageView.messageInReplyToView.localId"/>
+                <MessageInReplyToView t-if="messageView.messageInReplyToView" record="messageView.messageInReplyToView"/>
                 <div t-if="messageView.isActive and messageView.messageActionList" class="o_Message_actionListContainer position-absolute pl-5 pr-3" t-att-class="{ 'o-squashed': messageView.isSquashed }">
-                    <MessageActionList localId="messageView.messageActionList.localId"/>
+                    <MessageActionList record="messageView.messageActionList"/>
                 </div>
                 <div class="d-flex flex-shrink-0">
                     <div class="o_Message_highlightIndicator h-100" t-att-class="{ 'o-active bg-primary': messageView.message.isHighlighted or messageView.isHighlighted }"/>
@@ -46,7 +46,7 @@
                                             'text-100': !messageView.message.isDiscussionOrNotification and !messageView.isSelected,
                                         }"
                                         hasOpenChat="messageView.hasAuthorOpenChat"
-                                        partnerLocalId="messageView.message.author.localId"
+                                        partner="messageView.message.author"
                                     />
                                 </t>
                             </div>
@@ -58,7 +58,7 @@
                                 </small>
                             </t>
                             <t t-if="!messageView.isActive and messageView.messageSeenIndicatorView">
-                                <MessageSeenIndicator className="'o_Message_seenIndicator'" localId="messageView.messageSeenIndicatorView.localId"/>
+                                <MessageSeenIndicator className="'o_Message_seenIndicator'" record="messageView.messageSeenIndicatorView"/>
                             </t>
                         </t>
                     </div>
@@ -98,7 +98,7 @@
                                     </small>
                                 </t>
                                 <t t-if="messageView.messageSeenIndicatorView">
-                                    <MessageSeenIndicator className="'o_Message_seenIndicator'" localId="messageView.messageSeenIndicatorView.localId"/>
+                                    <MessageSeenIndicator className="'o_Message_seenIndicator'" record="messageView.messageSeenIndicatorView"/>
                                 </t>
                                 <t t-if="messageView.threadView and messageView.message.originThread and messageView.message.originThread !== messageView.threadView.thread">
                                     <small class="o_Message_originThread" t-att-class="{ 'o-message-selected text-600': messageView.isSelected, 'text-500': !messageView.isSelected }">
@@ -122,7 +122,7 @@
                                                 <i name="notificationIcon" class="o_Message_notificationIcon fa fa-envelope-o"/>
                                             </span>
                                             <t t-set-slot="opened">
-                                                <MessageNotificationPopoverContent localId="messageView.localId"/>
+                                                <MessageNotificationPopoverContent record="messageView"/>
                                             </t>
                                         </Popover>
                                     </t>
@@ -139,7 +139,7 @@
                             <t t-if="messageView.composerViewInEditing">
                                 <Composer
                                     className="'o_Message_composer mb-1'"
-                                    localId="messageView.composerViewInEditing.localId"
+                                    record="messageView.composerViewInEditing"
                                 />
                             </t>
                             <t t-if="messageView.message.subtype_description and !messageView.message.isBodyEqualSubtypeDescription">
@@ -153,10 +153,10 @@
                                 </ul>
                             </t>
                         </div>
-                        <AttachmentList t-if="messageView.attachmentList" localId="messageView.attachmentList.localId"/>
+                        <AttachmentList t-if="messageView.attachmentList" record="messageView.attachmentList"/>
                         <div t-if="messageView.message.messageReactionGroups.length > 0" class="d-flex flex-wrap ml-2">
                             <t t-foreach="messageView.message.messageReactionGroups" t-as="messageReactionGroup" t-key="messageReactionGroup.localId">
-                                <MessageReactionGroup className="'mr-1 mb-1'" localId="messageReactionGroup.localId"/>
+                                <MessageReactionGroup className="'mr-1 mb-1'" record="messageReactionGroup"/>
                             </t>
                         </div>
                     </div>
diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.js b/addons/mail/static/src/components/message_action_list/message_action_list.js
index be8c6c34603..336d092003f 100644
--- a/addons/mail/static/src/components/message_action_list/message_action_list.js
+++ b/addons/mail/static/src/components/message_action_list/message_action_list.js
@@ -12,20 +12,20 @@ export class MessageActionList extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'actionReactionRef', modelName: 'MessageActionList', refName: 'actionReaction' });
+        useRefToModel({ fieldName: 'actionReactionRef', refName: 'actionReaction' });
     }
 
     /**
      * @returns {MessageActionList}
      */
     get messageActionList() {
-        return this.messaging && this.messaging.models['MessageActionList'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MessageActionList, {
-    props: { localId: String },
+    props: { record: Object },
     template: "mail.MessageActionList",
 });
 
diff --git a/addons/mail/static/src/components/message_action_list/message_action_list.xml b/addons/mail/static/src/components/message_action_list/message_action_list.xml
index 96dfb5722b5..1b0f331b33f 100644
--- a/addons/mail/static/src/components/message_action_list/message_action_list.xml
+++ b/addons/mail/static/src/components/message_action_list/message_action_list.xml
@@ -4,7 +4,7 @@
         <t t-if="messageActionList">
             <div class="o_MessageActionList d-flex border rounded-sm bg-white" t-attf-class="{{ className }}" t-on-click="messageActionList.onClick" t-ref="root">
                 <i t-if="messageActionList.message.hasReactionIcon" class="o_MessageActionList_action o_MessageActionList_actionReaction fa fa-lg fa-smile-o p-2 o_cursor_pointer" t-att-title="messageActionList.addReactionText" t-on-click="messageActionList.onClickActionReaction" t-ref="actionReaction"/>
-                <PopoverView t-if="messageActionList.reactionPopoverView" localId="messageActionList.reactionPopoverView.localId"/>
+                <PopoverView t-if="messageActionList.reactionPopoverView" record="messageActionList.reactionPopoverView"/>
                 <span t-if="messageActionList.message.canStarBeToggled" class="o_MessageActionList_action o_MessageActionList_actionStar p-2 o_cursor_pointer" t-att-class="{
                         'o_MessageActionList_actionStar_active': messageActionList.message.isStarred,
                         'fa fa-lg fa-star': messageActionList.message.isStarred,
diff --git a/addons/mail/static/src/components/message_author_prefix/message_author_prefix.js b/addons/mail/static/src/components/message_author_prefix/message_author_prefix.js
index 5a23cfcdd95..66a218f10dd 100644
--- a/addons/mail/static/src/components/message_author_prefix/message_author_prefix.js
+++ b/addons/mail/static/src/components/message_author_prefix/message_author_prefix.js
@@ -10,13 +10,13 @@ export class MessageAuthorPrefix extends Component {
      * @returns {MessageAuthorPrefixView}
      */
     get messageAuthorPrefixView() {
-        return this.messaging && this.messaging.models['MessageAuthorPrefixView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MessageAuthorPrefix, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessageAuthorPrefix',
 });
 
diff --git a/addons/mail/static/src/components/message_in_reply_to_view/message_in_reply_to_view.js b/addons/mail/static/src/components/message_in_reply_to_view/message_in_reply_to_view.js
index 4293ee3cb60..1925baec668 100644
--- a/addons/mail/static/src/components/message_in_reply_to_view/message_in_reply_to_view.js
+++ b/addons/mail/static/src/components/message_in_reply_to_view/message_in_reply_to_view.js
@@ -10,12 +10,12 @@ export class MessageInReplyToView extends Component {
      * @returns {MessageInReplyToView}
      */
     get messageInReplyToView() {
-        return this.messaging && this.messaging.models['MessageInReplyToView'].get(this.props.localId);
+        return this.props.record;
     }
 }
 
 Object.assign(MessageInReplyToView, {
-    props: { localId: String },
+    props: { record: Object },
     template: "mail.MessageInReplyToView",
 });
 
diff --git a/addons/mail/static/src/components/message_list/message_list.js b/addons/mail/static/src/components/message_list/message_list.js
index 0b8a92c08b4..3d32729aae3 100644
--- a/addons/mail/static/src/components/message_list/message_list.js
+++ b/addons/mail/static/src/components/message_list/message_list.js
@@ -16,7 +16,7 @@ export class MessageList extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'MessageListView' });
+        useComponentToModel({ fieldName: 'component' });
         /**
          * Reference of the "load more" item. Useful to trigger load more
          * on scroll when it becomes visible.
@@ -146,7 +146,7 @@ export class MessageList extends Component {
      * @returns {MessageListView}
      */
     get messageListView() {
-        return this.messaging && this.messaging.models['MessageListView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -331,7 +331,7 @@ export class MessageList extends Component {
 
 Object.assign(MessageList, {
     components: { Transition },
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessageList',
 });
 
diff --git a/addons/mail/static/src/components/message_list/message_list.xml b/addons/mail/static/src/components/message_list/message_list.xml
index fdcbd138f74..deaee1347d9 100644
--- a/addons/mail/static/src/components/message_list/message_list.xml
+++ b/addons/mail/static/src/components/message_list/message_list.xml
@@ -62,7 +62,7 @@
                                 <t t-set="current_day" t-value="message_day"/>
                             </div>
                         </t>
-                        <Message localId="messageView.localId"/>
+                        <Message record="messageView"/>
                     </t>
                 </t>
                 <!-- LOADING (if order desc)-->
diff --git a/addons/mail/static/src/components/message_notification_popover_content/message_notification_popover_content.js b/addons/mail/static/src/components/message_notification_popover_content/message_notification_popover_content.js
index fd99280d29a..61165967656 100644
--- a/addons/mail/static/src/components/message_notification_popover_content/message_notification_popover_content.js
+++ b/addons/mail/static/src/components/message_notification_popover_content/message_notification_popover_content.js
@@ -10,13 +10,13 @@ export class MessageNotificationPopoverContent extends Component {
      * @returns {MessageView}
      */
     get messageView() {
-        return this.messaging && this.messaging.models['MessageView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MessageNotificationPopoverContent, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessageNotificationPopoverContent',
 });
 
diff --git a/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js b/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js
index 6e26af2a727..7eb9a22db91 100644
--- a/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js
+++ b/addons/mail/static/src/components/message_reaction_group/message_reaction_group.js
@@ -7,13 +7,13 @@ const { Component } = owl;
 export class MessageReactionGroup extends Component {
 
     get messageReactionGroup() {
-        return this.messaging.models['MessageReactionGroup'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MessageReactionGroup, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessageReactionGroup',
 });
 
diff --git a/addons/mail/static/src/components/message_seen_indicator/message_seen_indicator.js b/addons/mail/static/src/components/message_seen_indicator/message_seen_indicator.js
index 9bfdb84c8c1..7f88e52cae0 100644
--- a/addons/mail/static/src/components/message_seen_indicator/message_seen_indicator.js
+++ b/addons/mail/static/src/components/message_seen_indicator/message_seen_indicator.js
@@ -14,12 +14,12 @@ export class MessageSeenIndicator extends Component {
      * @returns {MessageSeenIndicator}
      */
      get messageSeenIndicatorView() {
-        return this.messaging && this.messaging.models['MessageSeenIndicatorView'].get(this.props.localId);
+        return this.props.record;
     }
 }
 
 Object.assign(MessageSeenIndicator, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessageSeenIndicator',
 });
 
diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.js b/addons/mail/static/src/components/messaging_menu/messaging_menu.js
index 73f55e3ba4d..9000016e1f9 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.js
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.js
@@ -12,7 +12,7 @@ export class MessagingMenu extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'MessagingMenu' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     //--------------------------------------------------------------------------
@@ -23,13 +23,13 @@ export class MessagingMenu extends Component {
      * @returns {MessagingMenu}
      */
     get messagingMenu() {
-        return this.messaging && this.messaging.models['MessagingMenu'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MessagingMenu, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MessagingMenu',
 });
 
diff --git a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
index b521aadb48e..4851116e8db 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
@@ -23,9 +23,9 @@
                         <t t-else="">
                             <div class="o_MessagingMenu_dropdownMenuHeader border-bottom" t-att-class="{ 'o-isDeviceSmall': messaging.device.isSmall }">
                                 <t t-if="!messaging.device.isSmall">
-                                    <MessagingMenuTab messagingMenuLocalId="messagingMenu.localId" tabId="'all'"/>
-                                    <MessagingMenuTab messagingMenuLocalId="messagingMenu.localId" tabId="'chat'"/>
-                                    <MessagingMenuTab messagingMenuLocalId="messagingMenu.localId" tabId="'channel'"/>
+                                    <MessagingMenuTab messagingMenu="messagingMenu" tabId="'all'"/>
+                                    <MessagingMenuTab messagingMenu="messagingMenu" tabId="'chat'"/>
+                                    <MessagingMenuTab messagingMenu="messagingMenu" tabId="'channel'"/>
                                 </t>
                                 <t t-if="messaging.device.isSmall">
                                     <t t-call="mail.MessagingMenu.newMessageButton"/>
@@ -37,7 +37,7 @@
                                 <t t-if="messagingMenu.mobileNewMessageAutocompleteInputView">
                                     <AutocompleteInput
                                         className="'o_MessagingMenu_mobileNewMessageInput'"
-                                        localId="messagingMenu.mobileNewMessageAutocompleteInputView.localId"
+                                        record="messagingMenu.mobileNewMessageAutocompleteInputView"
                                         select="messagingMenu.onMobileNewMessageInputSelect"
                                         source="messagingMenu.onMobileNewMessageInputSource"
                                         onHide="messagingMenu.onHideMobileNewMessage"
@@ -45,12 +45,12 @@
                                 </t>
                             </div>
                             <t t-if="messagingMenu.notificationListView">
-                                <NotificationList className="'o_MessagingMenu_notificationList'" classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }" localId="messagingMenu.notificationListView.localId"/>
+                                <NotificationList className="'o_MessagingMenu_notificationList'" classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }" record="messagingMenu.notificationListView"/>
                             </t>
                             <t t-if="messagingMenu.mobileMessagingNavbarView">
                                 <MobileMessagingNavbar
                                     className="'o_MessagingMenu_mobileNavbar'"
-                                    localId="messagingMenu.mobileMessagingNavbarView.localId"
+                                    record="messagingMenu.mobileMessagingNavbarView"
                                 />
                             </t>
                         </t>
diff --git a/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.xml b/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.xml
index 13d4b86b73d..3dc1f7c756f 100644
--- a/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.xml
+++ b/addons/mail/static/src/components/messaging_menu_container/messaging_menu_container.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.MessagingMenuContainer" owl="1">
         <div class="MessagingMenuContainer">
             <t t-if="messaging and messaging.messagingMenu">
-                <MessagingMenu localId="messaging.messagingMenu.localId"/>
+                <MessagingMenu record="messaging.messagingMenu"/>
             </t>
             <t t-else="">
                 <i class="o_MessagingMenuContainer_spinner fa fa-circle-o-notch fa-spin mx-2" title="Please wait..."/>
diff --git a/addons/mail/static/src/components/messaging_menu_tab/messaging_menu_tab.js b/addons/mail/static/src/components/messaging_menu_tab/messaging_menu_tab.js
index b3b93f63679..5a4ffe05291 100644
--- a/addons/mail/static/src/components/messaging_menu_tab/messaging_menu_tab.js
+++ b/addons/mail/static/src/components/messaging_menu_tab/messaging_menu_tab.js
@@ -14,14 +14,14 @@ export class MessagingMenuTab extends Component {
      * @returns {MessagingMenu}
      */
     get messagingMenu() {
-        return this.messaging && this.messaging.models['MessagingMenu'].get(this.props.messagingMenuLocalId);
+        return this.props.messagingMenu;
     }
 
 }
 
 Object.assign(MessagingMenuTab, {
     props: {
-        messagingMenuLocalId: String,
+        messagingMenu: Object,
         tabId: String,
     },
     template: 'mail.MessagingMenuTab',
diff --git a/addons/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js b/addons/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js
index da740484af2..dc11dac89ce 100644
--- a/addons/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js
+++ b/addons/mail/static/src/components/mobile_messaging_navbar/mobile_messaging_navbar.js
@@ -10,13 +10,13 @@ export class MobileMessagingNavbar extends Component {
      * @returns {MobileMessagingNavbarView}
      */
     get mobileMessagingNavbarView() {
-        return this.messaging && this.messaging.models['MobileMessagingNavbarView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(MobileMessagingNavbar, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.MobileMessagingNavbar',
 });
 
diff --git a/addons/mail/static/src/components/notification_group/notification_group.js b/addons/mail/static/src/components/notification_group/notification_group.js
index ba430673849..fea62e5f8a9 100644
--- a/addons/mail/static/src/components/notification_group/notification_group.js
+++ b/addons/mail/static/src/components/notification_group/notification_group.js
@@ -12,7 +12,7 @@ export class NotificationGroup extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'markAsReadRef', modelName: 'NotificationGroupView', refName: 'markAsRead' });
+        useRefToModel({ fieldName: 'markAsReadRef', refName: 'markAsRead' });
     }
 
     //--------------------------------------------------------------------------
@@ -23,13 +23,13 @@ export class NotificationGroup extends Component {
      * @returns {NotificationGroupView}
      */
     get notificationGroupView() {
-        return this.messaging && this.messaging.models['NotificationGroupView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(NotificationGroup, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.NotificationGroup',
 });
 
diff --git a/addons/mail/static/src/components/notification_list/notification_list.js b/addons/mail/static/src/components/notification_list/notification_list.js
index df46ba3533e..4bcd9e83a0f 100644
--- a/addons/mail/static/src/components/notification_list/notification_list.js
+++ b/addons/mail/static/src/components/notification_list/notification_list.js
@@ -10,13 +10,13 @@ export class NotificationList extends Component {
      * @returns {NotificationListView}
      */
     get notificationListView() {
-        return this.messaging && this.messaging.models['NotificationListView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(NotificationList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.NotificationList',
 });
 
diff --git a/addons/mail/static/src/components/notification_list/notification_list.xml b/addons/mail/static/src/components/notification_list/notification_list.xml
index 100a8dedd3a..d17ffb75981 100644
--- a/addons/mail/static/src/components/notification_list/notification_list.xml
+++ b/addons/mail/static/src/components/notification_list/notification_list.xml
@@ -15,27 +15,27 @@
                             <ThreadPreview
                                 className="'o_NotificationList_preview'"
                                 classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }"
-                                localId="notificationView.localId"
+                                record="notificationView"
                             />
                         </t>
                         <t t-if="notificationView.constructor.name === 'ThreadNeedactionPreviewView'">
                             <ThreadNeedactionPreview
                                 className="'o_NotificationList_preview'"
                                 classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }"
-                                localId="notificationView.localId"
+                                record="notificationView"
                             />
                         </t>
                         <t t-if="notificationView.constructor.name === 'NotificationGroupView'">
                             <NotificationGroup
                                 className="'o_NotificationList_group'"
-                                localId="notificationView.localId"
+                                record="notificationView"
                             />
                         </t>
                         <t t-if="notificationView.constructor.name === 'NotificationRequestView'">
                             <NotificationRequest
                                 className="'o_NotificationList_notificationRequest'"
                                 classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }"
-                                localId="notificationView.localId"
+                                record="notificationView"
                             />
                         </t>
                         <t t-if="!notificationView_last">
diff --git a/addons/mail/static/src/components/notification_request/notification_request.js b/addons/mail/static/src/components/notification_request/notification_request.js
index 7f9115381dd..7fac0c9ea35 100644
--- a/addons/mail/static/src/components/notification_request/notification_request.js
+++ b/addons/mail/static/src/components/notification_request/notification_request.js
@@ -25,7 +25,7 @@ export class NotificationRequest extends Component {
      * @returns {NotificationRequestView}
      */
     get notificationRequestView() {
-        return this.messaging && this.messaging.models['NotificationRequestView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -70,7 +70,7 @@ export class NotificationRequest extends Component {
 }
 
 Object.assign(NotificationRequest, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.NotificationRequest',
 });
 
diff --git a/addons/mail/static/src/components/notification_request/notification_request.xml b/addons/mail/static/src/components/notification_request/notification_request.xml
index 7326eb3c8d3..bc5c58ab311 100644
--- a/addons/mail/static/src/components/notification_request/notification_request.xml
+++ b/addons/mail/static/src/components/notification_request/notification_request.xml
@@ -10,7 +10,7 @@
                         <PartnerImStatusIcon
                             className="'o_NotificationRequest_partnerImStatusIcon'"
                             classNameObj="{ 'o-isDeviceSmall': messaging.device.isSmall }"
-                            partnerLocalId="messaging.partnerRoot.localId"
+                            partner="messaging.partnerRoot"
                         />
                     </div>
                 </div>
diff --git a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js b/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js
index bf0c8783364..27aff3c1d15 100644
--- a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js
+++ b/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.js
@@ -14,7 +14,7 @@ export class PartnerImStatusIcon extends Component {
      * @returns {Partner}
      */
     get partner() {
-        return this.messaging && this.messaging.models['Partner'].get(this.props.partnerLocalId);
+        return this.props.partner;
     }
 
     //--------------------------------------------------------------------------
@@ -40,7 +40,7 @@ Object.assign(PartnerImStatusIcon, {
         hasOpenChat: false,
     },
     props: {
-        partnerLocalId: String,
+        partner: Object,
         hasBackground: { type: Boolean, optional: true },
         /**
          * Determines whether a click on `this` should open a chat with
diff --git a/addons/mail/static/src/components/popover_view/popover_view.js b/addons/mail/static/src/components/popover_view/popover_view.js
index 9e890743a49..bfacf0f542c 100644
--- a/addons/mail/static/src/components/popover_view/popover_view.js
+++ b/addons/mail/static/src/components/popover_view/popover_view.js
@@ -14,7 +14,7 @@ export class PopoverView extends Component {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'PopoverView' });
+        useComponentToModel({ fieldName: 'component' });
         usePosition(
             () => this.popoverView && this.popoverView.anchorRef && this.popoverView.anchorRef.el,
             {
@@ -29,13 +29,13 @@ export class PopoverView extends Component {
      * @returns {PopoverView|undefined}
      */
     get popoverView() {
-        return this.messaging && this.messaging.models['PopoverView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(PopoverView, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.PopoverView',
 });
 
diff --git a/addons/mail/static/src/components/popover_view/popover_view.xml b/addons/mail/static/src/components/popover_view/popover_view.xml
index 76a222206ef..70e3724543e 100644
--- a/addons/mail/static/src/components/popover_view/popover_view.xml
+++ b/addons/mail/static/src/components/popover_view/popover_view.xml
@@ -7,7 +7,7 @@
                 <t
                     t-component="constructor.components[popoverView.contentComponentName]"
                     className="popoverView.contentClassName"
-                    t-props="{ localId: popoverView.content.localId }"
+                    t-props="{ record: popoverView.content }"
                 />
             </div>
         </t>
diff --git a/addons/mail/static/src/components/rtc_activity_notice/rtc_activity_notice.js b/addons/mail/static/src/components/rtc_activity_notice/rtc_activity_notice.js
index 11306019f85..f9fb068ba8e 100644
--- a/addons/mail/static/src/components/rtc_activity_notice/rtc_activity_notice.js
+++ b/addons/mail/static/src/components/rtc_activity_notice/rtc_activity_notice.js
@@ -10,13 +10,13 @@ export class RtcActivityNotice extends Component {
      * @returns {RtcActivityNoticeView}
      */
     get rtcActivityNoticeView() {
-        return this.messaging && this.messaging.models['RtcActivityNoticeView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcActivityNotice, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcActivityNotice',
 });
 
diff --git a/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.xml b/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.xml
index da33ce22afe..ed2ccb30bdf 100644
--- a/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.xml
+++ b/addons/mail/static/src/components/rtc_activity_notice_container/rtc_activity_notice_container.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.RtcActivityNoticeContainer" owl="1">
         <div class="RtcActivityNoticeContainer">
             <t t-if="messaging">
-                <RtcActivityNotice localId="messaging.rtc.rtcActivityNoticeView.localId"/>
+                <RtcActivityNotice record="messaging.rtc.rtcActivityNoticeView"/>
             </t>
         </div>
     </t>
diff --git a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js
index cabf5c1a43d..b4a896276b1 100644
--- a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js
+++ b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.js
@@ -14,7 +14,7 @@ export class RtcCallParticipantCard extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'volumeMenuAnchorRef', modelName: 'RtcCallParticipantCard', refName: 'volumeMenuAnchor' });
+        useRefToModel({ fieldName: 'volumeMenuAnchorRef', refName: 'volumeMenuAnchor' });
     }
 
     //--------------------------------------------------------------------------
@@ -25,13 +25,13 @@ export class RtcCallParticipantCard extends Component {
      * @returns {Thread|undefined}
      */
     get callParticipantCard() {
-        return this.messaging.models['RtcCallParticipantCard'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcCallParticipantCard, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcCallParticipantCard',
     components: { Popover },
 });
diff --git a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.xml b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.xml
index 1cb07a12e4a..6d535b41012 100644
--- a/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.xml
+++ b/addons/mail/static/src/components/rtc_call_participant_card/rtc_call_participant_card.xml
@@ -20,7 +20,7 @@
                 >
                     <!-- card -->
                     <t t-if="callParticipantCard.rtcVideoView">
-                        <RtcVideo localId="callParticipantCard.rtcVideoView.localId"/>
+                        <RtcVideo record="callParticipantCard.rtcVideoView"/>
                     </t>
                     <t t-else="">
                         <div class="o_RtcCallParticipantCard_avatarFrame mh-100 mw-100 h-100 align-items-center justify-content-center" t-att-class="{ 'o-isMinimized': callParticipantCard.isMinimized }" draggable="false">
diff --git a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
index 02a3a197050..0f4103cec5a 100644
--- a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
+++ b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.js
@@ -37,7 +37,7 @@ export class RtcCallViewer extends Component {
      * @returns {RtcCallViewer}
      */
     get rtcCallViewer() {
-        return this.messaging.models['RtcCallViewer'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -128,7 +128,7 @@ export class RtcCallViewer extends Component {
 
 Object.assign(RtcCallViewer, {
     components,
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcCallViewer',
 });
 
diff --git a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.xml b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.xml
index 420b7a098ae..770f12212a9 100644
--- a/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.xml
+++ b/addons/mail/static/src/components/rtc_call_viewer/rtc_call_viewer.xml
@@ -12,7 +12,7 @@
                 <t t-if="rtcCallViewer.layout !== 'tiled'">
                     <div class="o_RtcCallViewer_mainParticipantContainer justify-content-center mw-100 mh-100">
                         <t t-if="rtcCallViewer.mainParticipantCard">
-                            <RtcCallParticipantCard className="'o_RtcCallViewer_participantCard w-100'" localId="rtcCallViewer.mainParticipantCard.localId"/>
+                            <RtcCallParticipantCard className="'o_RtcCallViewer_participantCard w-100'" record="rtcCallViewer.mainParticipantCard"/>
                         </t>
                     </div>
                 </t>
@@ -31,7 +31,7 @@
                                 <!-- maybe filter focused partner out? -->
                                 <RtcCallParticipantCard
                                     className="'o_RtcCallViewer_participantCard o_RtcCallViewer_gridTile mw-100'"
-                                    localId="participantCard.localId"
+                                    record="participantCard"
                                 />
                             </t>
                         </t>
@@ -43,7 +43,7 @@
             <t t-if="rtcCallViewer.showOverlay or !rtcCallViewer.isControllerFloating">
                 <div class="o_RtcCallViewer_controls" t-att-class="{ 'o-isFloating': rtcCallViewer.isControllerFloating }">
                     <div class="o_RtcCallViewer_controlsOverlayContainer" t-on-mousemove="rtcCallViewer.onMouseMoveOverlay">
-                        <RtcController localId="rtcCallViewer.rtcController.localId"/>
+                        <RtcController record="rtcCallViewer.rtcController"/>
                     </div>
                 </div>
             </t>
@@ -51,7 +51,7 @@
             <!-- Dialogs -->
             <t t-if="messaging.userSetting.rtcConfigurationMenu.isOpen">
                 <Dialog size="'small'" title="rtcCallViewer.settingsTitle" onClosed="rtcCallViewer.onRtcSettingsDialogClosed">
-                    <RtcConfigurationMenu localId="messaging.userSetting.rtcConfigurationMenu.localId"/>
+                    <RtcConfigurationMenu record="messaging.userSetting.rtcConfigurationMenu"/>
                     <t t-set-slot="buttons">
                         <!-- Explicit No buttons -->
                     </t>
@@ -59,7 +59,7 @@
             </t>
             <t t-if="rtcCallViewer.rtcLayoutMenu">
                 <Dialog size="'small'" title="rtcCallViewer.layoutSettingsTitle" onClosed="rtcCallViewer.onLayoutSettingsDialogClosed">
-                    <RtcLayoutMenu localId="rtcCallViewer.rtcLayoutMenu.localId"/>
+                    <RtcLayoutMenu record="rtcCallViewer.rtcLayoutMenu"/>
                     <t t-set-slot="buttons">
                         <!-- Explicit No buttons -->
                     </t>
diff --git a/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js b/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js
index d3f602b12d3..90a4cd3c37c 100644
--- a/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js
+++ b/addons/mail/static/src/components/rtc_configuration_menu/rtc_configuration_menu.js
@@ -27,13 +27,13 @@ export class RtcConfigurationMenu extends Component {
      * @returns {RtcConfigurationMenu|undefined}
      */
     get rtcConfigurationMenu() {
-        return this.messaging && this.messaging.models['RtcConfigurationMenu'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcConfigurationMenu, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcConfigurationMenu',
 });
 
diff --git a/addons/mail/static/src/components/rtc_controller/rtc_controller.js b/addons/mail/static/src/components/rtc_controller/rtc_controller.js
index cddb079bc44..ddcece1a724 100644
--- a/addons/mail/static/src/components/rtc_controller/rtc_controller.js
+++ b/addons/mail/static/src/components/rtc_controller/rtc_controller.js
@@ -12,13 +12,13 @@ export class RtcController extends Component {
      * @returns {RtcController}
      */
     get rtcController() {
-        return this.messaging && this.messaging.models['RtcController'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcController, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcController',
     components: { Popover },
 });
diff --git a/addons/mail/static/src/components/rtc_controller/rtc_controller.xml b/addons/mail/static/src/components/rtc_controller/rtc_controller.xml
index 6cdf753fa8a..5d9d986d55d 100644
--- a/addons/mail/static/src/components/rtc_controller/rtc_controller.xml
+++ b/addons/mail/static/src/components/rtc_controller/rtc_controller.xml
@@ -69,7 +69,7 @@
                                 </div>
                             </button>
                             <t t-set-slot="opened">
-                                <RtcOptionList localId="rtcController.rtcOptionList.localId"/>
+                                <RtcOptionList record="rtcController.rtcOptionList"/>
                             </t>
                         </Popover>
                     </t>
diff --git a/addons/mail/static/src/components/rtc_invitation_card/rtc_invitation_card.js b/addons/mail/static/src/components/rtc_invitation_card/rtc_invitation_card.js
index 27f6786cba8..ef5edd0956b 100644
--- a/addons/mail/static/src/components/rtc_invitation_card/rtc_invitation_card.js
+++ b/addons/mail/static/src/components/rtc_invitation_card/rtc_invitation_card.js
@@ -14,13 +14,13 @@ export class RtcInvitationCard extends Component {
      * @returns {RtcInvitationCard|undefined}
      */
     get rtcInvitationCard() {
-        return this.messaging.models['RtcInvitationCard'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcInvitationCard, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcInvitationCard',
 });
 
diff --git a/addons/mail/static/src/components/rtc_invitations/rtc_invitations.xml b/addons/mail/static/src/components/rtc_invitations/rtc_invitations.xml
index 3f7724bce04..b123c0ca017 100644
--- a/addons/mail/static/src/components/rtc_invitations/rtc_invitations.xml
+++ b/addons/mail/static/src/components/rtc_invitations/rtc_invitations.xml
@@ -5,7 +5,7 @@
         <div class="o_RtcInvitations" t-attf-class="{{ className }}" t-ref="root">
             <t t-if="messaging.ringingThreads">
                 <t t-foreach="messaging.rtcInvitationCards" t-as="rtcInvitationCard" t-key="rtcInvitationCard.localId">
-                    <RtcInvitationCard localId="rtcInvitationCards.localId"/>
+                    <RtcInvitationCard record="rtcInvitationCards"/>
                 </t>
             </t>
         </div>
diff --git a/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js b/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
index 2731a20e5a0..f305f8a6fb2 100644
--- a/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
+++ b/addons/mail/static/src/components/rtc_layout_menu/rtc_layout_menu.js
@@ -11,20 +11,20 @@ export class RtcLayoutMenu extends LegacyComponent {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'RtcLayoutMenu' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     /**
      * @returns {RtcLayoutMenu}
      */
     get layoutMenu() {
-        return this.messaging && this.messaging.models['RtcLayoutMenu'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcLayoutMenu, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcLayoutMenu',
 });
 
diff --git a/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js b/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
index 567927678d3..730337dc08f 100644
--- a/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
+++ b/addons/mail/static/src/components/rtc_option_list/rtc_option_list.js
@@ -11,20 +11,20 @@ export class RtcOptionList extends LegacyComponent {
      */
     setup() {
         super.setup();
-        useComponentToModel({ fieldName: 'component', modelName: 'RtcOptionList' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     /**
      * @returns {RtcOptionList}
      */
     get rtcOptionList() {
-        return this.messaging && this.messaging.models['RtcOptionList'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(RtcOptionList, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcOptionList',
 });
 
diff --git a/addons/mail/static/src/components/rtc_video/rtc_video.js b/addons/mail/static/src/components/rtc_video/rtc_video.js
index f00d055dab3..b79df8a06be 100644
--- a/addons/mail/static/src/components/rtc_video/rtc_video.js
+++ b/addons/mail/static/src/components/rtc_video/rtc_video.js
@@ -23,7 +23,7 @@ export class RtcVideo extends Component {
      * @returns {RtcVideoView}
      */
      get rtcVideoView() {
-        return this.messaging && this.messaging.models['RtcVideoView'].get(this.props.localId);
+        return this.props.record;
     }
 
     //--------------------------------------------------------------------------
@@ -58,7 +58,7 @@ export class RtcVideo extends Component {
 }
 
 Object.assign(RtcVideo, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.RtcVideo',
 });
 
diff --git a/addons/mail/static/src/components/thread_icon/thread_icon.js b/addons/mail/static/src/components/thread_icon/thread_icon.js
index bfc24d887b1..6fb1c5801ea 100644
--- a/addons/mail/static/src/components/thread_icon/thread_icon.js
+++ b/addons/mail/static/src/components/thread_icon/thread_icon.js
@@ -10,13 +10,13 @@ export class ThreadIcon extends Component {
      * @returns {Thread}
      */
     get thread() {
-        return this.messaging && this.messaging.models['Thread'].get(this.props.threadLocalId);
+        return this.props.thread;
     }
 
 }
 
 Object.assign(ThreadIcon, {
-    props: { threadLocalId: String },
+    props: { thread: Object },
     template: 'mail.ThreadIcon',
 });
 
diff --git a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js
index da0321463f0..054f750adf2 100644
--- a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js
+++ b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.js
@@ -14,7 +14,7 @@ export class ThreadNeedactionPreview extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'markAsReadRef', modelName: 'ThreadNeedactionPreviewView', refName: 'markAsRead' });
+        useRefToModel({ fieldName: 'markAsReadRef', refName: 'markAsRead' });
     }
 
     //--------------------------------------------------------------------------
@@ -55,13 +55,13 @@ export class ThreadNeedactionPreview extends Component {
      * @returns {ThreadNeedactionPreviewView}
      */
     get threadNeedactionPreviewView() {
-        return this.messaging && this.messaging.models['ThreadNeedactionPreviewView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ThreadNeedactionPreview, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ThreadNeedactionPreview',
 });
 
diff --git a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml
index 511fed5871d..add788dd4fd 100644
--- a/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml
+++ b/addons/mail/static/src/components/thread_needaction_preview/thread_needaction_preview.xml
@@ -17,7 +17,7 @@
                                 classNameObj="{
                                     'o-isDeviceSmall': messaging.device.isSmall,
                                 }"
-                                partnerLocalId="threadNeedactionPreviewView.thread.correspondent.localId"
+                                partner="threadNeedactionPreviewView.thread.correspondent"
                             />
                         </t>
                     </div>
@@ -42,7 +42,7 @@
                     <div class="o_ThreadNeedactionPreview_core d-flex align-items-baseline">
                         <span class="o_ThreadNeedactionPreview_coreItem o_ThreadNeedactionPreview_inlineText text-truncate" t-att-class="{ 'o-empty': inlineLastNeedactionMessageAsOriginThreadBody.length === 0 }">
                             <t t-if="threadNeedactionPreviewView.messageAuthorPrefixView">
-                                <MessageAuthorPrefix localId="threadNeedactionPreviewView.messageAuthorPrefixView.localId"/>
+                                <MessageAuthorPrefix record="threadNeedactionPreviewView.messageAuthorPrefixView"/>
                             </t>
                             <t t-esc="inlineLastNeedactionMessageAsOriginThreadBody"/>
                         </span>
diff --git a/addons/mail/static/src/components/thread_preview/thread_preview.js b/addons/mail/static/src/components/thread_preview/thread_preview.js
index da42da2c57f..53a72bed0e8 100644
--- a/addons/mail/static/src/components/thread_preview/thread_preview.js
+++ b/addons/mail/static/src/components/thread_preview/thread_preview.js
@@ -14,7 +14,7 @@ export class ThreadPreview extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'markAsReadRef', modelName: 'ThreadPreviewView', refName: 'markAsRead' });
+        useRefToModel({ fieldName: 'markAsReadRef', refName: 'markAsRead' });
     }
 
     //--------------------------------------------------------------------------
@@ -49,13 +49,13 @@ export class ThreadPreview extends Component {
      * @returns {ThreadPreviewView}
      */
     get threadPreviewView() {
-        return this.messaging && this.messaging.models['ThreadPreviewView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ThreadPreview, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ThreadPreview',
 });
 
diff --git a/addons/mail/static/src/components/thread_preview/thread_preview.xml b/addons/mail/static/src/components/thread_preview/thread_preview.xml
index ed51938e0f8..70ce654278d 100644
--- a/addons/mail/static/src/components/thread_preview/thread_preview.xml
+++ b/addons/mail/static/src/components/thread_preview/thread_preview.xml
@@ -18,7 +18,7 @@
                                     'o-isDeviceSmall': messaging.device.isSmall,
                                     'o-muted': threadPreviewView.thread.localMessageUnreadCounter === 0,
                                 }"
-                                partnerLocalId="threadPreviewView.thread.correspondent.localId"
+                                partner="threadPreviewView.thread.correspondent"
                             />
                         </t>
                     </div>
@@ -46,7 +46,7 @@
                     <div class="o_ThreadPreview_core d-flex align-items-baseline">
                         <span class="o_ThreadPreview_coreItem o_ThreadPreview_inlineText text-truncate" t-att-class="{ 'o-empty': inlineLastMessageBody.length === 0 }">
                             <t t-if="threadPreviewView.messageAuthorPrefixView">
-                                <MessageAuthorPrefix localId="threadPreviewView.messageAuthorPrefixView.localId"/>
+                                <MessageAuthorPrefix record="threadPreviewView.messageAuthorPrefixView"/>
                             </t>
                             <t t-esc="inlineLastMessageBody"/>
                         </span>
diff --git a/addons/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js b/addons/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js
index 64e3806d9f4..339e011bd6f 100644
--- a/addons/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js
+++ b/addons/mail/static/src/components/thread_textual_typing_status/thread_textual_typing_status.js
@@ -10,13 +10,13 @@ export class ThreadTextualTypingStatus extends Component {
      * @returns {Thread}
      */
     get thread() {
-        return this.messaging && this.messaging.models['Thread'].get(this.props.threadLocalId);
+        return this.props.thread;
     }
 
 }
 
 Object.assign(ThreadTextualTypingStatus, {
-    props: { threadLocalId: String },
+    props: { thread: Object },
     template: 'mail.ThreadTextualTypingStatus',
 });
 
diff --git a/addons/mail/static/src/components/thread_view/thread_view.js b/addons/mail/static/src/components/thread_view/thread_view.js
index dfbd4abca81..09cfad1b51c 100644
--- a/addons/mail/static/src/components/thread_view/thread_view.js
+++ b/addons/mail/static/src/components/thread_view/thread_view.js
@@ -14,13 +14,13 @@ export class ThreadView extends Component {
      * @returns {ThreadView}
      */
     get threadView() {
-        return this.messaging && this.messaging.models['ThreadView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ThreadView, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ThreadView',
 });
 
diff --git a/addons/mail/static/src/components/thread_view/thread_view.xml b/addons/mail/static/src/components/thread_view/thread_view.xml
index e0b3bb9b8bc..a74b07b90d1 100644
--- a/addons/mail/static/src/components/thread_view/thread_view.xml
+++ b/addons/mail/static/src/components/thread_view/thread_view.xml
@@ -5,12 +5,12 @@
         <t t-if="threadView">
             <div class="o_ThreadView" t-att-class="threadView.extraClass" t-attf-class="{{ className }}" t-att-data-correspondent-id="threadView.thread and threadView.thread.correspondent and threadView.thread.correspondent.id" t-att-data-thread-local-id="threadView.thread and threadView.thread.localId" t-on-focusin="threadView.onFocusin" t-ref="root">
                 <t t-if="threadView.topbar">
-                    <ThreadViewTopbar className="'border-bottom'" localId="threadView.topbar.localId"/>
+                    <ThreadViewTopbar className="'border-bottom'" record="threadView.topbar"/>
                 </t>
                 <div class="o_ThreadView_bottomPart d-flex flex-grow-1">
                     <div class="o_ThreadView_core d-flex flex-column flex-grow-1">
                         <t t-if="threadView.rtcCallViewer">
-                            <RtcCallViewer localId="threadView.rtcCallViewer.localId"/>
+                            <RtcCallViewer record="threadView.rtcCallViewer"/>
                         </t>
                         <t t-if="threadView.isLoading and !threadView.threadCache.isLoaded" name="loadingCondition">
                             <div class="o_ThreadView_loading">
@@ -20,7 +20,7 @@
                         <t t-elif="threadView.messageListView">
                             <MessageList
                                 className="'o_ThreadView_messageList'"
-                                localId="threadView.messageListView.localId"
+                                record="threadView.messageListView"
                             />
                         </t>
                         <t t-elif="threadView.threadCache.hasLoadingFailed">
@@ -39,12 +39,12 @@
                         <t t-if="threadView.composerView">
                             <Composer
                                 className="'o_ThreadView_composer'"
-                                localId="threadView.composerView.localId"
+                                record="threadView.composerView"
                             />
                         </t>
                     </div>
                     <t t-if="threadView.channelMemberListView">
-                        <ChannelMemberList className="'o_ThreadView_channelMemberList flex-shrink-0 border-left'" localId="threadView.channelMemberListView.localId"/>
+                        <ChannelMemberList className="'o_ThreadView_channelMemberList flex-shrink-0 border-left'" record="threadView.channelMemberListView"/>
                     </t>
                 </div>
             </div>
diff --git a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
index d6508a69da4..b3af1878ed9 100644
--- a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
+++ b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.js
@@ -13,11 +13,11 @@ export class ThreadViewTopbar extends Component {
      */
     setup() {
         super.setup();
-        useRefToModel({ fieldName: 'guestNameInputRef', modelName: 'ThreadViewTopbar', refName: 'guestNameInput' });
-        useRefToModel({ fieldName: 'inviteButtonRef', modelName: 'ThreadViewTopbar', refName: 'inviteButton' });
-        useRefToModel({ fieldName: 'threadNameInputRef', modelName: 'ThreadViewTopbar', refName: 'threadNameInput' });
-        useRefToModel({ fieldName: 'threadDescriptionInputRef', modelName: 'ThreadViewTopbar', refName: 'threadDescriptionInput' });
-        useUpdateToModel({ methodName: 'onComponentUpdate', modelName: 'ThreadViewTopbar' });
+        useRefToModel({ fieldName: 'guestNameInputRef', refName: 'guestNameInput' });
+        useRefToModel({ fieldName: 'inviteButtonRef', refName: 'inviteButton' });
+        useRefToModel({ fieldName: 'threadNameInputRef', refName: 'threadNameInput' });
+        useRefToModel({ fieldName: 'threadDescriptionInputRef', refName: 'threadDescriptionInput' });
+        useUpdateToModel({ methodName: 'onComponentUpdate' });
     }
 
     //--------------------------------------------------------------------------
@@ -28,13 +28,13 @@ export class ThreadViewTopbar extends Component {
      * @returns {ThreadViewTopbar}
      */
     get threadViewTopbar() {
-        return this.messaging && this.messaging.models['ThreadViewTopbar'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(ThreadViewTopbar, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.ThreadViewTopbar',
 });
 
diff --git a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml
index 088b40e7f0f..4457a113c53 100644
--- a/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml
+++ b/addons/mail/static/src/components/thread_view_topbar/thread_view_topbar.xml
@@ -5,7 +5,7 @@
         <t t-if="threadViewTopbar">
             <div class="o_ThreadViewTopbar d-flex flex-shrink-0 w-100 px-3" t-attf-class="{{ className }}" t-ref="root">
                 <t t-if="threadViewTopbar.thread">
-                    <ThreadIcon className="'o_ThreadViewTopbar_threadIcon mr-2 align-self-center'" threadLocalId="threadViewTopbar.thread.localId"/>
+                    <ThreadIcon className="'o_ThreadViewTopbar_threadIcon mr-2 align-self-center'" thread="threadViewTopbar.thread"/>
                 </t>
                 <div class="o_ThreadViewTopbar_title d-flex flex-grow-1 align-self-center align-items-center">
                     <t t-if="threadViewTopbar.thread">
@@ -62,7 +62,7 @@
                             <i class="fa fa-lg fa-user-plus"/>
                         </button>
                         <t t-if="threadViewTopbar.invitePopoverView">
-                            <PopoverView className="'o_ThreadViewTopbar_invitePopoverView'" localId="threadViewTopbar.invitePopoverView.localId"/>
+                            <PopoverView className="'o_ThreadViewTopbar_invitePopoverView'" record="threadViewTopbar.invitePopoverView"/>
                         </t>
                     </t>
                     <!-- FIXME: guests should be able to see members but there currently is no route for it, so hide it for now -->
diff --git a/addons/mail/static/src/components/welcome_view/welcome_view.js b/addons/mail/static/src/components/welcome_view/welcome_view.js
index b3bc0a76ccd..8b55f63aaab 100644
--- a/addons/mail/static/src/components/welcome_view/welcome_view.js
+++ b/addons/mail/static/src/components/welcome_view/welcome_view.js
@@ -21,13 +21,13 @@ export class WelcomeView extends Component {
      * @returns {WelcomeView}
      */
     get welcomeView() {
-        return this.messaging && this.messaging.models['WelcomeView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(WelcomeView, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'mail.WelcomeView',
 });
 
diff --git a/addons/mail/static/src/components/welcome_view/welcome_view.xml b/addons/mail/static/src/components/welcome_view/welcome_view.xml
index 9abbc4c70f2..6837183b9c4 100644
--- a/addons/mail/static/src/components/welcome_view/welcome_view.xml
+++ b/addons/mail/static/src/components/welcome_view/welcome_view.xml
@@ -10,7 +10,7 @@
                 </h1>
                 <h2 class="m-5" t-esc="messaging.companyName"/>
                 <div class="d-flex justify-content-center">
-                    <MediaPreview t-if="welcomeView.mediaPreview" className="'mr-5'" localId="welcomeView.mediaPreview.localId"/>
+                    <MediaPreview t-if="welcomeView.mediaPreview" className="'mr-5'" record="welcomeView.mediaPreview"/>
                     <div class="d-flex flex-column justify-content-center">
                         <t t-if="messaging.currentGuest">
                             <label class="o_WelcomeView_guestNameInputLabel text-center" t-att-for="welcomeView.guestNameInputUniqueId">What's your name?</label>
diff --git a/addons/mail/static/src/model/model_manager.js b/addons/mail/static/src/model/model_manager.js
index 62afc4a2885..0145856a232 100644
--- a/addons/mail/static/src/model/model_manager.js
+++ b/addons/mail/static/src/model/model_manager.js
@@ -656,7 +656,7 @@ export class ModelManager {
             // Field values of record.
             __values: {},
         });
-        const record = !this.isDebug ? nonProxyRecord : new Proxy(nonProxyRecord, {
+        const record = owl.markRaw(!this.isDebug ? nonProxyRecord : new Proxy(nonProxyRecord, {
             get: function getFromProxy(record, prop) {
                 if (
                     !model.__fieldMap[prop] &&
@@ -668,7 +668,7 @@ export class ModelManager {
                 }
                 return record[prop];
             },
-        });
+        }));
         // Ensure X2many relations are Set initially (other fields can stay undefined).
         for (const field of model.__fieldList) {
             record.__values[field.fieldName] = undefined;
diff --git a/addons/mail/static/src/public/discuss_public_boot.js b/addons/mail/static/src/public/discuss_public_boot.js
index 2a10f2ee1aa..3200d29c8b3 100644
--- a/addons/mail/static/src/public/discuss_public_boot.js
+++ b/addons/mail/static/src/public/discuss_public_boot.js
@@ -85,7 +85,7 @@ async function createAndMountDiscussPublicView(templates) {
         env: Component.env,
         dev: Component.env.isDebug(),
         props: {
-            localId: discussPublicView.localId,
+            record: discussPublicView,
         },
     });
 }
diff --git a/addons/mail/static/tests/helpers/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js
index ba839ecb625..e23c78ac7ec 100644
--- a/addons/mail/static/tests/helpers/test_utils.js
+++ b/addons/mail/static/tests/helpers/test_utils.js
@@ -427,7 +427,7 @@ function getCreateComposerComponent({ env, modelManager, target }) {
             }),
         });
         return await createRootMessagingComponent(env, "Composer", {
-            props: { localId: composerView.localId, ...props },
+            props: { record: composerView, ...props },
             target,
         });
     };
@@ -441,7 +441,7 @@ function getCreateComposerSuggestionComponent({ env, modelManager, target }) {
             }),
         });
         await createRootMessagingComponent(env, "ComposerSuggestion", {
-            props: { ...props, composerViewLocalId: composerView.localId },
+            props: { ...props, composerView: composerView },
             target,
         });
     };
@@ -453,7 +453,7 @@ function getCreateFollowerListMenuComponent({ env, modelManager, target }) {
             qunitTest: insertAndReplace(),
         });
         return await createRootMessagingComponent(env, "FollowerListMenu", {
-            props: { localId: followerListMenuView.localId, threadLocalId: thread.localId, ...props },
+            props: { record: followerListMenuView, thread, ...props },
             target,
         });
     };
@@ -466,7 +466,7 @@ function getCreateMessageComponent({ env, modelManager, target }) {
             qunitTest: insertAndReplace(),
         });
         await createRootMessagingComponent(env, "Message", {
-            props: { localId: messageView.localId },
+            props: { record: messageView },
             target,
         });
     };
@@ -485,7 +485,7 @@ function getCreateNotificationListComponent({ env, modelManager, target }) {
             qunitTestOwner: insertAndReplace(),
         });
         await createRootMessagingComponent(env, "NotificationList", {
-            props: { localId: notificationListView.localId },
+            props: { record: notificationListView },
             target,
         });
     };
@@ -508,7 +508,7 @@ function getCreateThreadViewComponent({ afterEvent, env, target }) {
             actualTarget = target;
         }
         async function func() {
-            return createRootMessagingComponent(env, "ThreadView", { props: { localId: threadView.localId, ...otherProps }, target: actualTarget });
+            return createRootMessagingComponent(env, "ThreadView", { props: { record: threadView, ...otherProps }, target: actualTarget });
         }
         if (waitUntilMessagesLoaded) {
             await afterNextRender(() => afterEvent({
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
index c3c9dabdbda..b21d356c5e1 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
@@ -16,8 +16,8 @@ QUnit.module('follower_subtype_tests.js', {
     beforeEach() {
         this.createFollowerSubtypeComponent = async ({ follower, followerSubtype, target }) => {
             const props = {
-                followerLocalId: follower.localId,
-                followerSubtypeLocalId: followerSubtype.localId,
+                follower,
+                followerSubtype,
             };
             await createRootMessagingComponent(follower.env, "FollowerSubtype", {
                 props,
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
index da7e3a6b8d4..6e824063617 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
@@ -16,7 +16,7 @@ QUnit.module('follower_tests.js', {
     beforeEach() {
         this.createFollowerComponent = async (follower, target) => {
             await createRootMessagingComponent(follower.env, "Follower", {
-                props: { followerLocalId: follower.localId },
+                props: { follower },
                 target,
             });
         };
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
index c75ed30dc9d..0368301f128 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
@@ -12,7 +12,7 @@ QUnit.module('message_seen_indicator_tests.js', {
     beforeEach() {
         this.createMessageSeenIndicatorComponent = async ({ message, target, thread }, otherProps) => {
             const props = Object.assign(
-                { messageLocalId: message.localId, threadLocalId: thread.localId },
+                { message, thread },
                 otherProps
             );
             await createRootMessagingComponent(thread.env, "MessageSeenIndicator", {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
index 0507fbfc3cd..7cfd7cd92ff 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
@@ -548,7 +548,7 @@ QUnit.test('do not show messaging seen indicator if before last seen by all mess
         },
     ]);
      await createRootMessagingComponent(env, "Message", {
-        props: { localId: threadViewer.threadView.messageViews[0].localId },
+        props: { record: threadViewer.threadView.messageViews[0] },
         target,
     });
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
index 5eea555b805..9ad2a702129 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
@@ -12,7 +12,7 @@ QUnit.module('partner_im_status_icon_tests.js', {
     beforeEach() {
         this.createPartnerImStatusIcon = async (partner, target) => {
             await createRootMessagingComponent(partner.env, "PartnerImStatusIcon", {
-                props: { partnerLocalId: partner.localId },
+                props: { partner },
                 target,
             });
         };
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index 523d556d2f6..3bbb410936e 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -13,7 +13,7 @@ QUnit.module('thread_icon_tests.js', {
     async beforeEach() {
         this.createThreadIcon = async (thread, target) => {
             await createRootMessagingComponent(thread.env, "ThreadIcon", {
-                props: { threadLocalId: thread.localId },
+                props: { thread },
                 target,
             });
         };
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
index 5b9d34ed146..cae963ec2ca 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
@@ -14,7 +14,7 @@ QUnit.module('thread_textual_typing_status_tests.js', {
     beforeEach() {
         this.createThreadTextualTypingStatusComponent = async (thread, target) => {
             await createRootMessagingComponent(thread.env, "ThreadTextualTypingStatus", {
-                props: { threadLocalId: thread.localId },
+                props: { thread },
                 target,
             });
         };
diff --git a/addons/snailmail/static/src/components/message/message.xml b/addons/snailmail/static/src/components/message/message.xml
index 265edb66d81..fbbf9f5b983 100644
--- a/addons/snailmail/static/src/components/message/message.xml
+++ b/addons/snailmail/static/src/components/message/message.xml
@@ -22,7 +22,7 @@
         -->
         <xpath expr="//MessageNotificationPopoverContent" position="replace">
             <t t-if="messageView.message.message_type === 'snailmail'">
-                <SnailmailNotificationPopover messageLocalId="messageView.message.localId"/>
+                <SnailmailNotificationPopover message="messageView.message"/>
             </t>
             <t t-else="">$0</t>
         </xpath>
diff --git a/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
index eadd73db71d..4ba3971bfca 100644
--- a/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
+++ b/addons/snailmail/static/src/components/snailmail_error/snailmail_error.js
@@ -11,20 +11,20 @@ export class SnailmailError extends Component {
      * @override
      */
     setup() {
-        useComponentToModel({ fieldName: 'component', modelName: 'SnailmailErrorView' });
+        useComponentToModel({ fieldName: 'component' });
     }
 
     /**
      * @returns {SnailmailErrorView}
      */
     get snailmailErrorView() {
-        return this.messaging && this.messaging.models['SnailmailErrorView'].get(this.props.localId);
+        return this.props.record;
     }
 
 }
 
 Object.assign(SnailmailError, {
-    props: { localId: String },
+    props: { record: Object },
     template: 'snailmail.SnailmailError',
 });
 
diff --git a/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js b/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js
index 6ab51696516..441a1597ec7 100644
--- a/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js
+++ b/addons/snailmail/static/src/components/snailmail_notification_popover/snailmail_notification_popover.js
@@ -42,7 +42,7 @@ class SnailmailNotificationPopover extends Component {
      * @returns {Message}
      */
     get message() {
-        return this.messaging && this.messaging.models['Message'].get(this.props.messageLocalId);
+        return this.props.message;
     }
 
     /**
@@ -56,9 +56,7 @@ class SnailmailNotificationPopover extends Component {
 }
 
 Object.assign(SnailmailNotificationPopover, {
-    props: {
-        messageLocalId: String,
-    },
+    props: { message: Object },
     template: 'snailmail.SnailmailNotificationPopover',
 });
 
diff --git a/addons/website_livechat/static/src/components/thread_view/thread_view.xml b/addons/website_livechat/static/src/components/thread_view/thread_view.xml
index 5e084bea815..1b34415b48f 100644
--- a/addons/website_livechat/static/src/components/thread_view/thread_view.xml
+++ b/addons/website_livechat/static/src/components/thread_view/thread_view.xml
@@ -5,7 +5,7 @@
             <t t-if="threadView.hasVisitorBanner">
                 <VisitorBanner
                     className="'border-bottom'"
-                    visitorLocalId="threadView.thread.visitor.localId"
+                    visitor="threadView.thread.visitor"
                 />
             </t>
         </xpath>
diff --git a/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js b/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js
index 1b6c5309985..6253cea7259 100644
--- a/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js
+++ b/addons/website_livechat/static/src/components/visitor_banner/visitor_banner.js
@@ -14,15 +14,13 @@ class VisitorBanner extends Component {
      * @returns {Visitor}
      */
     get visitor() {
-        return this.messaging && this.messaging.models['Visitor'].get(this.props.visitorLocalId);
+        return this.props.visitor;
     }
 
 }
 
 Object.assign(VisitorBanner, {
-    props: {
-        visitorLocalId: String,
-    },
+    props: { visitor: Object },
     template: 'website_livechat.VisitorBanner',
 });