From f8a7c8d31d9b8569288c932c813c5628388ffdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Wed, 18 Aug 2021 14:41:06 +0000
Subject: [PATCH] [IMP] mail, *: access messaging without env in most
 components
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* = snailmail

Part of task-2582313

closes odoo/odoo#75268

Related: odoo/enterprise#20333
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/components/activity/activity.js       |  2 +-
 .../attachment_viewer/attachment_viewer.xml   |  8 ++---
 .../channel_invitation_form.xml               |  2 +-
 .../src/components/chat_window/chat_window.js |  8 ++---
 .../components/chat_window/chat_window.xml    |  4 +--
 .../chat_window_header/chat_window_header.js  |  4 +--
 .../chat_window_header/chat_window_header.xml | 12 +++----
 .../src/components/composer/composer.js       |  6 ++--
 .../src/components/composer/composer.xml      | 20 +++++------
 .../static/src/components/discuss/discuss.js  |  4 +--
 .../static/src/components/discuss/discuss.xml | 34 +++++++++----------
 .../discuss_mobile_mailbox_selection.js       |  8 ++---
 .../discuss_sidebar/discuss_sidebar.js        |  8 ++---
 .../discuss_sidebar_item.js                   |  2 +-
 .../discuss_sidebar_item.xml                  |  2 +-
 .../static/src/components/message/message.js  |  6 ++--
 .../static/src/components/message/message.xml | 18 +++++-----
 .../message_author_prefix.xml                 |  2 +-
 .../components/message_list/message_list.xml  |  6 ++--
 .../messaging_menu/messaging_menu.js          | 20 +++--------
 .../messaging_menu/messaging_menu.xml         | 28 +++++++--------
 .../notification_group/notification_group.js  |  8 ++---
 .../partner_im_status_icon.xml                |  4 +--
 .../components/thread_icon/thread_icon.xml    |  8 ++---
 .../thread_needaction_preview.js              |  4 +--
 .../thread_needaction_preview.xml             |  4 +--
 .../thread_preview/thread_preview.js          |  4 +--
 .../thread_preview/thread_preview.xml         |  4 +--
 .../thread_view_topbar/thread_view_topbar.xml |  4 +--
 .../src/models/chat_window/chat_window.js     |  1 -
 .../static/src/components/message/message.js  |  4 +--
 .../snailmail_error_dialog.xml                |  8 ++---
 32 files changed, 123 insertions(+), 134 deletions(-)

diff --git a/addons/mail/static/src/components/activity/activity.js b/addons/mail/static/src/components/activity/activity.js
index 78cda729210..3f701d1f4f6 100644
--- a/addons/mail/static/src/components/activity/activity.js
+++ b/addons/mail/static/src/components/activity/activity.js
@@ -123,7 +123,7 @@ export class Activity extends Component {
             ev.target.dataset.oeId &&
             ev.target.dataset.oeModel
         ) {
-            this.env.messaging.openProfile({
+            this.activity.messaging.openProfile({
                 id: Number(ev.target.dataset.oeId),
                 model: ev.target.dataset.oeModel,
             });
diff --git a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
index 5ae37236191..0a1c4b3fae3 100644
--- a/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
+++ b/addons/mail/static/src/components/attachment_viewer/attachment_viewer.xml
@@ -26,8 +26,8 @@
                     </div>
                     <div class="o-autogrow"/>
                     <div class="o_AttachmentViewer_buttonDownload o_AttachmentViewer_headerItem o_AttachmentViewer_headerItemButton" t-on-click="_onClickDownload" role="button" title="Download">
-                        <i class="o_AttachmentViewer_headerItemButtonIcon fa fa-download fa-fw" t-att-class="{ 'o-hasLabel': env.messaging.device.sizeClass > env.device.SIZES.MD }" role="img"/>
-                        <t t-if="env.messaging.device.sizeClass > env.device.SIZES.MD">
+                        <i class="o_AttachmentViewer_headerItemButtonIcon fa fa-download fa-fw" t-att-class="{ 'o-hasLabel': attachmentViewer.messaging.device.sizeClass > env.device.SIZES.MD }" role="img"/>
+                        <t t-if="attachmentViewer.messaging.device.sizeClass > env.device.SIZES.MD">
                             <span>Download</span>
                         </t>
                     </div>
@@ -47,7 +47,7 @@
                         </div>
                     </t>
                     <t t-if="attachmentViewer.attachment.fileType === 'application/pdf'">
-                        <iframe class="o_AttachmentViewer_view o_AttachmentViewer_viewIframe o_AttachmentViewer_viewPdf" t-ref="iframeViewerPdf" t-att-class="{ 'o-isMobile': env.messaging.device.isMobile }" t-att-src="attachmentViewer.attachment.defaultSource"/>
+                        <iframe class="o_AttachmentViewer_view o_AttachmentViewer_viewIframe o_AttachmentViewer_viewPdf" t-ref="iframeViewerPdf" t-att-class="{ 'o-isMobile': attachmentViewer.messaging.device.isMobile }" t-att-src="attachmentViewer.attachment.defaultSource"/>
                     </t>
                     <t t-if="attachmentViewer.attachment.isTextFile">
                         <iframe class="o_AttachmentViewer_view o_AttachmentViewer_viewIframe o_text" t-att-src="attachmentViewer.attachment.defaultSource"/>
@@ -56,7 +56,7 @@
                         <iframe allow="autoplay; encrypted-media" class="o_AttachmentViewer_view o_AttachmentViewer_viewIframe o_AttachmentViewer_youtube" t-att-src="attachmentViewer.attachment.defaultSource" height="315" width="560"/>
                     </t>
                     <t t-if="attachmentViewer.attachment.fileType === 'video'">
-                        <video class="o_AttachmentViewer_view o_AttachmentViewer_viewVideo" t-att-class="{ 'o-isMobile': env.messaging.device.isMobile }" t-on-click="_onClickVideo" controls="controls">
+                        <video class="o_AttachmentViewer_view o_AttachmentViewer_viewVideo" t-att-class="{ 'o-isMobile': attachmentViewer.messaging.device.isMobile }" t-on-click="_onClickVideo" controls="controls">
                             <source t-att-data-type="attachmentViewer.attachment.mimetype" t-att-src="attachmentViewer.attachment.defaultSource"/>
                         </video>
                     </t>
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 1b331ad698f..eb1e12b7dd5 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
@@ -16,7 +16,7 @@
                                 <PartnerImStatusIcon
                                     class="o_ChannelInvitationForm_selectablePartnerImStatusIcon d-flex align-items-center justify-content-center text-white"
                                     t-att-class="{
-                                        'o_ChannelInvitationForm_selectablePartnerImStatusIcon-mobile': env.messaging.device.isMobile,
+                                        'o_ChannelInvitationForm_selectablePartnerImStatusIcon-mobile': selectablePartner.messaging.device.isMobile,
                                     }"
                                     partnerLocalId="selectablePartner.localId"
                                 />
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 ff4863f6505..7f56e0e34f4 100644
--- a/addons/mail/static/src/components/chat_window/chat_window.js
+++ b/addons/mail/static/src/components/chat_window/chat_window.js
@@ -75,7 +75,7 @@ export class ChatWindow extends Component {
      * @private
      */
     _applyVisibleOffset() {
-        const textDirection = this.env.messaging.locale.textDirection;
+        const textDirection = this.chatWindow.messaging.locale.textDirection;
         const offsetFrom = textDirection === 'rtl' ? 'left' : 'right';
         const oppositeFrom = offsetFrom === 'right' ? 'left' : 'right';
         this.el.style[offsetFrom] = this.chatWindow.visibleOffset + 'px';
@@ -161,11 +161,11 @@ export class ChatWindow extends Component {
      * @param {integer} ui.item.id
      */
     async _onAutocompleteSelect(ev, ui) {
-        const chat = await this.env.messaging.getChat({ partnerId: ui.item.id });
+        const chat = await this.chatWindow.messaging.getChat({ partnerId: ui.item.id });
         if (!chat) {
             return;
         }
-        this.env.messaging.chatWindowManager.openThread(chat, {
+        this.chatWindow.messaging.chatWindowManager.openThread(chat, {
             makeActive: true,
             replaceNewMessage: true,
         });
@@ -206,7 +206,7 @@ export class ChatWindow extends Component {
      */
     _onClickedHeader(ev) {
         ev.stopPropagation();
-        if (this.env.messaging.device.isMobile) {
+        if (this.chatWindow.messaging.device.isMobile) {
             return;
         }
         if (this.chatWindow.isFolded) {
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 52db36a7090..71d5d776f13 100644
--- a/addons/mail/static/src/components/chat_window/chat_window.xml
+++ b/addons/mail/static/src/components/chat_window/chat_window.xml
@@ -7,7 +7,7 @@
                 'o-focused': chatWindow and chatWindow.isFocused,
                 'o-folded': chatWindow and chatWindow.isFolded,
                 'o-fullscreen': props.isFullscreen,
-                'o-mobile': env.messaging.device.isMobile,
+                'o-mobile': chatWindow and chatWindow.messaging.device.isMobile,
                 'o-new-message': chatWindow and !chatWindow.thread,
             }" t-on-keydown="_onKeydown" t-on-focusout="_onFocusout" t-att-data-chat-window-local-id="chatWindow ? chatWindow.localId : undefined" t-att-data-thread-local-id="chatWindow ? (chatWindow.thread ? chatWindow.thread.localId : '') : undefined"
         >
@@ -26,7 +26,7 @@
                         composerAttachmentsDetailsMode="'card'"
                         hasComposer="chatWindow.thread.model !== 'mail.box'"
                         hasComposerCurrentPartnerAvatar="false"
-                        hasComposerSendButton="env.messaging.device.isMobile"
+                        hasComposerSendButton="chatWindow.messaging.device.isMobile"
                         hasSquashCloseMessages="chatWindow.thread.model !== 'mail.box'"
                         threadViewLocalId="chatWindow.threadView.localId"
                         t-on-focusin="_onFocusinThread"
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 fbe06bd7213..49ce57afeb9 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
@@ -25,7 +25,7 @@ export class ChatWindowHeader extends Component {
      * @returns {string}
      */
     get shiftNextText() {
-        if (this.env.messaging.locale.textDirection === 'rtl') {
+        if (this.chatWindow.messaging.locale.textDirection === 'rtl') {
             return this.env._t("Shift left");
         }
         return this.env._t("Shift right");
@@ -35,7 +35,7 @@ export class ChatWindowHeader extends Component {
      * @returns {string}
      */
     get shiftPrevText() {
-        if (this.env.messaging.locale.textDirection === 'rtl') {
+        if (this.chatWindow.messaging.locale.textDirection === 'rtl') {
             return this.env._t("Shift right");
         }
         return this.env._t("Shift left");
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 e4fa3dcf750..628e9e0ef45 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
@@ -2,10 +2,10 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.ChatWindowHeader" owl="1">
-        <div class="o_ChatWindowHeader" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClick">
+        <div class="o_ChatWindowHeader" t-att-class="{ 'o-mobile': chatWindow and chatWindow.messaging.device.isMobile }" t-on-click="_onClick">
             <t t-if="chatWindow">
                 <t t-if="props.hasCloseAsBackButton">
-                    <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandBack o_ChatWindowHeader_commandClose" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClickClose" title="Close conversation">
+                    <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandBack o_ChatWindowHeader_commandClose" t-att-class="{ 'o-mobile': chatWindow.messaging.device.isMobile }" t-on-click="_onClickClose" title="Close conversation">
                         <i class="fa fa-arrow-left"/>
                     </div>
                 </t>
@@ -26,24 +26,24 @@
                 <div class="o-autogrow"/>
                 <div class="o_ChatWindowHeader_item o_ChatWindowHeader_rightArea">
                     <t t-if="chatWindow.hasShiftPrev">
-                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandShiftPrev" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClickShiftPrev" t-att-title="shiftPrevText">
+                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandShiftPrev" t-att-class="{ 'o-mobile': chatWindow.messaging.device.isMobile }" t-on-click="_onClickShiftPrev" t-att-title="shiftPrevText">
                             <!-- this is reversed automatically when language is rtl -->
                             <i class="fa fa-angle-left"/>
                         </div>
                     </t>
                     <t t-if="chatWindow.hasShiftNext">
-                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandShiftNext" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClickShiftNext" t-att-title="shiftNextText">
+                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandShiftNext" t-att-class="{ 'o-mobile': chatWindow.messaging.device.isMobile }" t-on-click="_onClickShiftNext" t-att-title="shiftNextText">
                             <!-- this is reversed automatically when language is rtl -->
                             <i class="fa fa-angle-right"/>
                         </div>
                     </t>
                     <t t-if="props.isExpandable">
-                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandExpand" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClickExpand" title="Open in Discuss">
+                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandExpand" t-att-class="{ 'o-mobile': chatWindow.messaging.device.isMobile }" t-on-click="_onClickExpand" title="Open in Discuss">
                             <i class="fa fa-expand"/>
                         </div>
                     </t>
                     <t t-if="!props.hasCloseAsBackButton">
-                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandClose" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" t-on-click="_onClickClose" title="Close chat window">
+                        <div class="o_ChatWindowHeader_command o_ChatWindowHeader_commandClose" t-att-class="{ 'o-mobile': chatWindow.messaging.device.isMobile }" t-on-click="_onClickClose" title="Close chat window">
                             <i class="fa fa-close"/>
                         </div>
                     </t>
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index f1bbee2fedc..9b854620b8b 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -79,10 +79,10 @@ export class Composer extends Component {
      * @returns {string}
      */
     get currentPartnerAvatar() {
-        const avatar = this.env.messaging.currentUser
+        const avatar = this.composer.messaging.currentUser
             ? this.env.session.url('/web/image', {
                     field: 'avatar_128',
-                    id: this.env.messaging.currentUser.id,
+                    id: this.composer.messaging.currentUser.id,
                     model: 'res.users',
                 })
             : '/web/static/img/user_menu_avatar.png';
@@ -93,7 +93,7 @@ export class Composer extends Component {
      * Focus the composer.
      */
     focus() {
-        if (this.env.messaging.device.isMobile) {
+        if (this.composer.messaging.device.isMobile) {
             this.el.scrollIntoView();
         }
         this._textInputRef.comp.focus();
diff --git a/addons/mail/static/src/components/composer/composer.xml b/addons/mail/static/src/components/composer/composer.xml
index 90758f887d0..4180838c45b 100644
--- a/addons/mail/static/src/components/composer/composer.xml
+++ b/addons/mail/static/src/components/composer/composer.xml
@@ -67,7 +67,7 @@
                         class="o_Composer_textInput"
                         t-att-class="{
                             'o-composer-is-compact': props.isCompact,
-                            'o_Composer_textInput-mobile': env.messaging.device.isMobile,
+                            'o_Composer_textInput-mobile': composer.messaging.device.isMobile,
                             'o-has-current-partner-avatar': props.hasCurrentPartnerAvatar,
                         }"
                         composerLocalId="composer.localId"
@@ -80,7 +80,7 @@
                         t-key="composer.localId"
                         t-ref="textInput"
                     />
-                    <div class="o_Composer_buttons" t-att-class="{ 'o-composer-is-compact': props.isCompact, 'o-mobile': env.messaging.device.isMobile }">
+                    <div class="o_Composer_buttons" t-att-class="{ 'o-composer-is-compact': props.isCompact, 'o-mobile': composer.messaging.device.isMobile }">
                         <div class="o_Composer_toolButtons"
                             t-att-class="{
                                 'o-composer-has-current-partner-avatar': props.hasCurrentPartnerAvatar,
@@ -95,7 +95,7 @@
                                     <button class="o_Composer_button o_Composer_buttonEmojis o_Composer_toolButton btn btn-light"
                                         t-att-class="{
                                             'o-open': false and state.displayed,
-                                            'o-mobile': env.messaging.device.isMobile,
+                                            'o-mobile': composer.messaging.device.isMobile,
                                         }"
                                         t-on-keydown="_onKeydownEmojiButton"
                                     >
@@ -105,11 +105,11 @@
                                         <EmojisPopover t-ref="emojisPopover"/>
                                     </t>
                                 </Popover>
-                                <button class="o_Composer_button o_Composer_buttonAttachment o_Composer_toolButton btn btn-light fa fa-paperclip" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" title="Add attachment" type="button" t-on-click="_onClickAddAttachment"/>
+                                <button class="o_Composer_button o_Composer_buttonAttachment o_Composer_toolButton btn btn-light fa fa-paperclip" t-att-class="{ 'o-mobile': composer.messaging.device.isMobile }" title="Add attachment" type="button" t-on-click="_onClickAddAttachment"/>
                             </div>
                             <t t-if="props.isExpandable">
                                 <div class="o_Composer_secondaryToolButtons">
-                                    <button class="btn btn-light fa fa-expand o_Composer_button o_Composer_buttonFullComposer o_Composer_toolButton" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }" title="Full composer" type="button" t-on-click="_onClickFullComposer"/>
+                                    <button class="btn btn-light fa fa-expand o_Composer_button o_Composer_buttonFullComposer o_Composer_toolButton" t-att-class="{ 'o-mobile': composer.messaging.device.isMobile }" title="Full composer" type="button" t-on-click="_onClickFullComposer"/>
                                 </div>
                             </t>
                         </div>
@@ -149,9 +149,9 @@
             <t t-if="props.hasSendButton">
                 <button class="o_Composer_actionButton o_Composer_button o_Composer_buttonSend btn btn-primary"
                     t-att-class="{
-                        'fa': env.messaging.device.isMobile,
-                        'fa-paper-plane-o': env.messaging.device.isMobile,
-                        'o-last': env.messaging.device.isMobile or !props.hasDiscardButton,
+                        'fa': composer.messaging.device.isMobile,
+                        'fa-paper-plane-o': composer.messaging.device.isMobile,
+                        'o-last': composer.messaging.device.isMobile or !props.hasDiscardButton,
                         'o-composer-is-compact': props.isCompact,
                         'o-has-current-partner-avatar': props.hasCurrentPartnerAvatar,
                     }"
@@ -159,10 +159,10 @@
                     type="button"
                     t-on-click="_onClickSend"
                 >
-                    <t t-if="!env.messaging.device.isMobile"><t t-if="composer.isLog">Log</t><t t-else="">Send</t></t>
+                    <t t-if="!composer.messaging.device.isMobile"><t t-if="composer.isLog">Log</t><t t-else="">Send</t></t>
                 </button>
             </t>
-            <t t-if="!env.messaging.device.isMobile and props.hasDiscardButton">
+            <t t-if="!composer.messaging.device.isMobile and props.hasDiscardButton">
                 <button class="o_Composer_actionButton o-last o_Composer_button o_Composer_buttonDiscard btn btn-secondary" t-att-class="{ 'o-composer-is-compact': props.isCompact, 'o-has-current-partner-avatar': props.hasCurrentPartnerAvatar }" type="button" t-on-click="_onClickDiscard">
                     Discard
                 </button>
diff --git a/addons/mail/static/src/components/discuss/discuss.js b/addons/mail/static/src/components/discuss/discuss.js
index 7427914e647..e80fde04eee 100644
--- a/addons/mail/static/src/components/discuss/discuss.js
+++ b/addons/mail/static/src/components/discuss/discuss.js
@@ -45,7 +45,7 @@ export class Discuss extends Component {
         }
         if (
             this.discuss.thread &&
-            this.discuss.thread === this.env.messaging.inbox &&
+            this.discuss.thread === this.discuss.messaging.inbox &&
             this.discuss.threadView &&
             this._lastThreadCache === this.discuss.threadView.threadCache.localId &&
             this._lastThreadCounter > 0 && this.discuss.thread.counter === 0
@@ -216,7 +216,7 @@ export class Discuss extends Component {
             this.discuss.activeMobileNavbarTabId === 'mailbox' &&
             (!this.discuss.thread || this.discuss.thread.model !== 'mailbox')
         ) {
-            this.discuss.update({ thread: link(this.env.messaging.inbox) });
+            this.discuss.update({ thread: link(this.discuss.messaging.inbox) });
         }
         if (this.discuss.activeMobileNavbarTabId !== 'mailbox') {
             this.discuss.update({ thread: unlink() });
diff --git a/addons/mail/static/src/components/discuss/discuss.xml b/addons/mail/static/src/components/discuss/discuss.xml
index ba85994c92e..f60ddb97c97 100644
--- a/addons/mail/static/src/components/discuss/discuss.xml
+++ b/addons/mail/static/src/components/discuss/discuss.xml
@@ -5,17 +5,17 @@
         <div class="o_Discuss"
             t-att-class="{
                 'o-adding-item': discuss ? discuss.isAddingChannel or discuss.isAddingChat : false,
-                'o-mobile': env.messaging ? env.messaging.device.isMobile : false,
+                'o-mobile': discuss and discuss.messaging ? discuss.messaging.device.isMobile : false,
             }"
         >
             <t t-if="!env.isMessagingInitialized()">
                 <div class="o_Discuss_messagingNotInitialized"><i class="o_Discuss_messagingNotInitializedIcon fa fa-circle-o-notch fa-spin"/>Please wait...</div>
             </t>
             <t t-else="">
-                <t t-if="!env.messaging.device.isMobile">
+                <t t-if="!discuss.messaging.device.isMobile">
                     <DiscussSidebar class="o_Discuss_sidebar"/>
                 </t>
-                <t t-if="env.messaging.device.isMobile" t-call="mail.Discuss.content"/>
+                <t t-if="discuss.messaging.device.isMobile" t-call="mail.Discuss.content"/>
                 <t t-else="">
                     <div class="o_Discuss_content">
                         <t t-call="mail.Discuss.content"/>
@@ -26,10 +26,10 @@
     </t>
 
     <t t-name="mail.Discuss.content" owl="1">
-        <t t-if="env.messaging.device.isMobile and discuss.activeMobileNavbarTabId === 'mailbox'">
+        <t t-if="discuss.messaging.device.isMobile and discuss.activeMobileNavbarTabId === 'mailbox'">
             <DiscussMobileMailboxSelection class="o_Discuss_mobileMailboxSelection border-bottom"/>
         </t>
-        <t t-if="env.messaging.device.isMobile and (discuss.isAddingChannel or discuss.isAddingChat)">
+        <t t-if="discuss.messaging.device.isMobile and (discuss.isAddingChannel or discuss.isAddingChat)">
             <div class="o_Discuss_mobileAddItemHeader border-bottom">
                 <AutocompleteInput
                     class="o_Discuss_mobileAddItemHeaderInput"
@@ -45,33 +45,33 @@
         <t t-if="discuss.threadView">
             <ThreadView
                 class="o_Discuss_thread"
-                t-att-class="{ 'o-mobile': env.messaging.device.isMobile }"
+                t-att-class="{ 'o-mobile': discuss.messaging.device.isMobile }"
                 composerAttachmentsDetailsMode="'card'"
                 hasComposer="discuss.thread.model !== 'mail.box'"
-                hasComposerCurrentPartnerAvatar="!env.messaging.device.isMobile"
+                hasComposerCurrentPartnerAvatar="!discuss.messaging.device.isMobile"
                 hasComposerThreadTyping="true"
                 hasSquashCloseMessages="discuss.thread.model !== 'mail.box'"
-                haveMessagesMarkAsReadIcon="discuss.thread === env.messaging.inbox"
-                haveMessagesReplyIcon="discuss.thread === env.messaging.inbox"
+                haveMessagesMarkAsReadIcon="discuss.thread === discuss.messaging.inbox"
+                haveMessagesReplyIcon="discuss.thread === discuss.messaging.inbox"
                 isDoFocus="discuss.isDoFocus"
                 threadViewLocalId="discuss.threadView.localId"
                 t-on-o-focusin-composer="_onFocusinComposer"
                 t-ref="threadView"
             />
         </t>
-        <t t-if="!discuss.thread and (!env.messaging.device.isMobile or discuss.activeMobileNavbarTabId === 'mailbox')">
+        <t t-if="!discuss.thread and (!discuss.messaging.device.isMobile or discuss.activeMobileNavbarTabId === 'mailbox')">
             <div class="o_Discuss_noThread">
                 No conversation selected.
             </div>
         </t>
-        <t t-if="env.messaging.device.isMobile and discuss.activeMobileNavbarTabId !== 'mailbox'">
-            <t t-if="env.messaging.discuss.activeMobileNavbarTabId === 'chat'">
-                <button class="o_Discuss_mobileNewChatButton btn btn-secondary" t-on-click="env.messaging.discuss.onClickMobileNewChatButton.bind(env.messaging.discuss)">
+        <t t-if="discuss.messaging.device.isMobile and discuss.activeMobileNavbarTabId !== 'mailbox'">
+            <t t-if="discuss.activeMobileNavbarTabId === 'chat'">
+                <button class="o_Discuss_mobileNewChatButton btn btn-secondary" t-on-click="discuss.onClickMobileNewChatButton.bind(discuss)">
                     Start a conversation
                 </button>
             </t>
-            <t t-if="env.messaging.discuss.activeMobileNavbarTabId === 'channel'">
-                <button class="o_Discuss_mobileNewChannelButton btn btn-secondary" t-on-click="env.messaging.discuss.onClickMobileNewChannelButton.bind(env.messaging.discuss)">
+            <t t-if="discuss.activeMobileNavbarTabId === 'channel'">
+                <button class="o_Discuss_mobileNewChannelButton btn btn-secondary" t-on-click="discuss.onClickMobileNewChannelButton.bind(discuss)">
                     New Channel
                 </button>
             </t>
@@ -80,7 +80,7 @@
                 filter="discuss.activeMobileNavbarTabId"
             />
         </t>
-        <t t-if="env.messaging.device.isMobile and !discuss.isReplyingToMessage">
+        <t t-if="discuss.messaging.device.isMobile and !discuss.isReplyingToMessage">
             <MobileMessagingNavbar
                 class="o_Discuss_mobileNavbar"
                 activeTabId="discuss.activeMobileNavbarTabId"
@@ -92,7 +92,7 @@
             <Composer
                 class="o_Discuss_replyingToMessageComposer"
                 composerLocalId="discuss.replyingToMessage.originThread.composer.localId"
-                hasCurrentPartnerAvatar="!env.messaging.device.isMobile"
+                hasCurrentPartnerAvatar="!discuss.messaging.device.isMobile"
                 hasDiscardButton="true"
                 hasThreadName="true"
                 isDoFocus="discuss.isDoFocus"
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 9a706049611..fcd10df9cdc 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
@@ -17,16 +17,16 @@ export class DiscussMobileMailboxSelection extends Component {
         return this.env.models['mail.thread']
             .all(thread => thread.isPinned && thread.model === 'mail.box')
             .sort((mailbox1, mailbox2) => {
-                if (mailbox1 === this.env.messaging.inbox) {
+                if (mailbox1 === this.discuss.messaging.inbox) {
                     return -1;
                 }
-                if (mailbox2 === this.env.messaging.inbox) {
+                if (mailbox2 === this.discuss.messaging.inbox) {
                     return 1;
                 }
-                if (mailbox1 === this.env.messaging.starred) {
+                if (mailbox1 === this.discuss.messaging.starred) {
                     return -1;
                 }
-                if (mailbox2 === this.env.messaging.starred) {
+                if (mailbox2 === this.discuss.messaging.starred) {
                     return 1;
                 }
                 const mailbox1Name = mailbox1.displayName;
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 3645e842eeb..ac6785e1cef 100644
--- a/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
+++ b/addons/mail/static/src/components/discuss_sidebar/discuss_sidebar.js
@@ -52,16 +52,16 @@ export class DiscussSidebar extends Component {
         return this.env.models['mail.thread']
             .all(thread => thread.isPinned && thread.model === 'mail.box')
             .sort((mailbox1, mailbox2) => {
-                if (mailbox1 === this.env.messaging.inbox) {
+                if (mailbox1 === this.discuss.messaging.inbox) {
                     return -1;
                 }
-                if (mailbox2 === this.env.messaging.inbox) {
+                if (mailbox2 === this.discuss.messaging.inbox) {
                     return 1;
                 }
-                if (mailbox1 === this.env.messaging.starred) {
+                if (mailbox1 === this.discuss.messaging.starred) {
                     return -1;
                 }
-                if (mailbox2 === this.env.messaging.starred) {
+                if (mailbox2 === this.discuss.messaging.starred) {
                     return 1;
                 }
                 const mailbox1Name = mailbox1.displayName;
diff --git a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
index 624e2f6e2ae..1babc38c69b 100644
--- a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
+++ b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js
@@ -119,7 +119,7 @@ export class DiscussSidebarItem extends Component {
      */
     async _onClickLeave(ev) {
         ev.stopPropagation();
-        if (this.thread.creator === this.env.messaging.currentUser) {
+        if (this.thread.creator === this.discuss.messaging.currentUser) {
             await this._askAdminConfirmation();
         }
         this.thread.unsubscribe();
diff --git a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml
index 4015da276ff..b9e36e79b05 100644
--- a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml
+++ b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.xml
@@ -5,7 +5,7 @@
         <div class="o_DiscussSidebarItem"
             t-att-class="{
                 'o-active': thread and discuss.thread === thread,
-                'o-starred-box': thread and thread === env.messaging.starred,
+                'o-starred-box': thread and thread === thread.messaging.starred,
                 'o-unread': thread and thread.localMessageUnreadCounter > 0,
             }" t-on-click="_onClick" t-att-data-thread-local-id="thread ? thread.localId : undefined" t-att-data-thread-name="thread ? thread.displayName : undefined"
         >
diff --git a/addons/mail/static/src/components/message/message.js b/addons/mail/static/src/components/message/message.js
index cde3c18e2d4..6c88550acec 100644
--- a/addons/mail/static/src/components/message/message.js
+++ b/addons/mail/static/src/components/message/message.js
@@ -428,7 +428,7 @@ export class Message extends Component {
      */
     _onClick(ev) {
         if (ev.target.closest('.o_channel_redirect')) {
-            this.env.messaging.openProfile({
+            this.message.messaging.openProfile({
                 id: Number(ev.target.dataset.oeId),
                 model: 'mail.channel',
             });
@@ -438,7 +438,7 @@ export class Message extends Component {
         }
         if (ev.target.tagName === 'A') {
             if (ev.target.dataset.oeId && ev.target.dataset.oeModel) {
-                this.env.messaging.openProfile({
+                this.message.messaging.openProfile({
                     id: Number(ev.target.dataset.oeId),
                     model: ev.target.dataset.oeModel,
                 });
@@ -527,7 +527,7 @@ export class Message extends Component {
         // before the current handler is executed. Indeed because it does a
         // toggle it needs to take into account the value before the click.
         if (this._wasSelected) {
-            this.env.messaging.discuss.clearReplyingToMessage();
+            this.message.messaging.discuss.clearReplyingToMessage();
         } else {
             this.message.replyTo();
         }
diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml
index f8c916a9d97..b30c25b5181 100644
--- a/addons/mail/static/src/components/message/message.xml
+++ b/addons/mail/static/src/components/message/message.xml
@@ -8,7 +8,7 @@
                 'o-discussion': message and (message.is_discussion or message.is_notification),
                 'o-has-message-selection': threadView and threadView.threadViewer and threadView.threadViewer.selectedMessage,
                 'o-highlighted': message and message.isHighlighted,
-                'o-mobile': env.messaging.device.isMobile,
+                'o-mobile': message and message.messaging.device.isMobile,
                 'o-not-discussion': message and !(message.is_discussion or message.is_notification),
                 'o-notification': message and message.message_type === 'notification',
                 'o-selected': isSelected,
@@ -27,7 +27,7 @@
                                     class="o_Message_partnerImStatusIcon"
                                     t-att-class="{
                                         'o-message-selected': isSelected,
-                                        'o_Message_partnerImStatusIcon-mobile': env.messaging.device.isMobile,
+                                        'o_Message_partnerImStatusIcon-mobile': message.messaging.device.isMobile,
                                     }"
                                     hasOpenChat="hasAuthorOpenChat"
                                     partnerLocalId="message.author.localId"
@@ -41,7 +41,7 @@
                                 <t t-esc="shortTime"/>
                             </div>
                         </t>
-                        <div class="o_Message_commands o_Message_sidebarCommands o_Message_sidebarItem o-message-squashed" t-att-class="{ 'o-message-selected': isSelected, 'o-mobile': env.messaging.device.isMobile }">
+                        <div class="o_Message_commands o_Message_sidebarCommands o_Message_sidebarItem o-message-squashed" t-att-class="{ 'o-message-selected': isSelected, 'o-mobile': message.messaging.device.isMobile }">
                             <t t-if="message.message_type !== 'notification'">
                                 <div class="o_Message_command o_Message_commandStar fa"
                                     t-att-class="{
@@ -49,7 +49,7 @@
                                         'fa-star-o': !message.isStarred,
                                         'o-message-selected': isSelected,
                                         'o-message-starred': message.isStarred,
-                                        'o-mobile': env.messaging.device.isMobile,
+                                        'o-mobile': message.messaging.device.isMobile,
                                     }" t-on-click="_onClickStar"
                                 />
                             </t>
@@ -114,7 +114,7 @@
                                     </Popover>
                                 </t>
                             </t>
-                            <div class="o_Message_commands o_Message_headerCommands" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }">
+                            <div class="o_Message_commands o_Message_headerCommands" t-att-class="{ 'o-mobile': message.messaging.device.isMobile }">
                                 <t t-if="!message.isTemporary and ((message.message_type !== 'notification' and message.originThread and message.originThread.model === 'mail.channel') or !message.isTransient)">
                                     <span class="o_Message_command o_Message_commandStar o_Message_headerCommand fa"
                                         t-att-class="{
@@ -122,7 +122,7 @@
                                             'fa-star-o': !message.isStarred,
                                             'o-message-selected': isSelected,
                                             'o-message-starred': message.isStarred,
-                                            'o-mobile': env.messaging.device.isMobile,
+                                            'o-mobile': message.messaging.device.isMobile,
                                         }" t-on-click="_onClickStar" title="Mark as Todo"
                                     />
                                 </t>
@@ -130,7 +130,7 @@
                                     <span class="o_Message_command o_Message_commandReply o_Message_headerCommand fa fa-reply"
                                         t-att-class="{
                                             'o-message-selected': isSelected,
-                                            'o-mobile': env.messaging.device.isMobile,
+                                            'o-mobile': message.messaging.device.isMobile,
                                         }" t-on-click="_onClickReply" title="Reply"
                                     />
                                 </t>
@@ -138,7 +138,7 @@
                                     <span class="o_Message_command o_Message_commandMarkAsRead o_Message_headerCommand fa fa-check"
                                         t-att-class="{
                                             'o-message-selected': isSelected,
-                                            'o-mobile': env.messaging.device.isMobile,
+                                            'o-mobile': message.messaging.device.isMobile,
                                         }" t-on-click="_onClickMarkAsRead" title="Mark as Read"
                                     />
                                 </t>
@@ -177,7 +177,7 @@
                             <AttachmentList
                                 class="o_Message_attachmentList"
                                 areAttachmentsDownloadable="true"
-                                areAttachmentsEditable="message.author === env.messaging.currentPartner"
+                                areAttachmentsEditable="message.author === message.messaging.currentPartner"
                                 attachmentLocalIds="message.attachments.map(attachment => attachment.localId)"
                                 attachmentsDetailsMode="props.attachmentsDetailsMode"
                             />
diff --git a/addons/mail/static/src/components/message_author_prefix/message_author_prefix.xml b/addons/mail/static/src/components/message_author_prefix/message_author_prefix.xml
index eddc2b01c39..279b8f5c011 100644
--- a/addons/mail/static/src/components/message_author_prefix/message_author_prefix.xml
+++ b/addons/mail/static/src/components/message_author_prefix/message_author_prefix.xml
@@ -4,7 +4,7 @@
     <t t-name="mail.MessageAuthorPrefix" owl="1">
         <span class="o_MessageAuthorPrefix">
             <t t-if="message">
-                <t t-if="message.author and message.author === env.messaging.currentPartner">
+                <t t-if="message.author and message.author === message.messaging.currentPartner">
                     <i class="o_MessageAuthorPrefixIcon fa fa-mail-reply"/>You:
                 </t>
                 <t t-elif="thread and message.author !== thread.correspondent">
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 b9cc092ead8..b3b0e0b2aa6 100644
--- a/addons/mail/static/src/components/message_list/message_list.xml
+++ b/addons/mail/static/src/components/message_list/message_list.xml
@@ -7,19 +7,19 @@
                 <!-- No result messages -->
                 <t t-if="threadView.nonEmptyMessages.length === 0">
                     <div class="o_MessageList_empty o_MessageList_item">
-                        <t t-if="threadView.thread === env.messaging.inbox">
+                        <t t-if="threadView.thread === threadView.messaging.inbox">
                             <div class="o_MessageList_emptyTitle">
                                 Congratulations, your inbox is empty
                             </div>
                             New messages appear here.
                         </t>
-                        <t t-elif="threadView.thread === env.messaging.starred">
+                        <t t-elif="threadView.thread === threadView.messaging.starred">
                             <div class="o_MessageList_emptyTitle">
                                 No starred messages
                             </div>
                             You can mark any message as 'starred', and it shows up in this mailbox.
                         </t>
-                        <t t-elif="threadView.thread === env.messaging.history">
+                        <t t-elif="threadView.thread === threadView.messaging.history">
                             <div class="o_MessageList_emptyTitle o-neutral-face-icon">
                                 No history messages
                             </div>
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 52b2bc1ea0e..abcc3c92f3c 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.js
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.js
@@ -93,12 +93,7 @@ export class MessagingMenu extends Component {
      * @param {MouseEvent} ev
      */
     _onClickCaptureGlobal(ev) {
-        if (!this.env.messaging) {
-            /**
-             * Messaging not created, which means essential models like
-             * messaging menu are not ready, so user interactions are omitted
-             * during this (short) period of time.
-             */
+        if (!this.messagingMenu) {
             return;
         }
         // ignore click inside the menu
@@ -122,8 +117,8 @@ export class MessagingMenu extends Component {
      * @param {MouseEvent} ev
      */
     _onClickNewMessage(ev) {
-        if (!this.env.messaging.device.isMobile) {
-            this.env.messaging.chatWindowManager.openNewMessage();
+        if (!this.messagingMenu.messaging.device.isMobile) {
+            this.messagingMenu.messaging.chatWindowManager.openNewMessage();
             this.messagingMenu.close();
         } else {
             this.messagingMenu.toggleMobileNewMessage();
@@ -137,12 +132,7 @@ export class MessagingMenu extends Component {
     _onClickToggler(ev) {
         // avoid following dummy href
         ev.preventDefault();
-        if (!this.env.messaging) {
-            /**
-             * Messaging not created, which means essential models like
-             * messaging menu are not ready, so user interactions are omitted
-             * during this (short) period of time.
-             */
+        if (!this.messagingMenu) {
             return;
         }
         this.messagingMenu.toggleOpen();
@@ -165,7 +155,7 @@ export class MessagingMenu extends Component {
      * @param {integer} ui.item.id
      */
     _onMobileNewMessageInputSelect(ev, ui) {
-        this.env.messaging.openChat({ partnerId: ui.item.id });
+        this.messagingMenu.messaging.openChat({ partnerId: ui.item.id });
     }
 
     /**
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 72392081ba0..ae36ab31658 100644
--- a/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
+++ b/addons/mail/static/src/components/messaging_menu/messaging_menu.xml
@@ -2,10 +2,10 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.MessagingMenu" owl="1">
-        <li class="o_MessagingMenu" t-att-class="{ 'o-is-open': messagingMenu ? messagingMenu.isOpen : false, 'o-mobile': env.messaging ? env.messaging.device.isMobile : false }">
+        <li class="o_MessagingMenu" t-att-class="{ 'o-is-open': messagingMenu ? messagingMenu.isOpen : false, 'o-mobile': messagingMenu and messagingMenu.messaging ? messagingMenu.messaging.device.isMobile : false }">
             <a class="o_MessagingMenu_toggler" t-att-class="{ 'o-no-notification': messagingMenu ? !messagingMenu.counter : false }" href="#" title="Conversations" role="button" t-att-aria-expanded="messagingMenu and messagingMenu.isOpen ? 'true' : 'false'" aria-haspopup="true" t-on-click="_onClickToggler">
                 <i class="o_MessagingMenu_icon fa fa-comments" role="img" aria-label="Messages"/>
-                <t t-if="!env.isMessagingInitialized()">
+                <t t-if="!messagingMenu or !messagingMenu.messaging.isInitialized">
                     <i class="o_MessagingMenu_loading fa fa-circle-o-notch fa-spin"/>
                 </t>
                 <t t-elif="messagingMenu.counter > 0">
@@ -15,13 +15,13 @@
                 </t>
             </a>
             <t t-if="messagingMenu and messagingMenu.isOpen">
-                <div class="o_MessagingMenu_dropdownMenu dropdown-menu dropdown-menu-right" t-att-class="{ 'o-mobile': env.messaging.device.isMobile, 'o-messaging-not-initialized': !env.messaging.isInitialized }" role="menu">
-                    <t t-if="!env.messaging.isInitialized">
+                <div class="o_MessagingMenu_dropdownMenu dropdown-menu dropdown-menu-right" t-att-class="{ 'o-mobile': messagingMenu.messaging.device.isMobile, 'o-messaging-not-initialized': !messagingMenu.messaging.isInitialized }" role="menu">
+                    <t t-if="!messagingMenu.messaging.isInitialized">
                         <span><i class="o_MessagingMenu_dropdownLoadingIcon fa fa-circle-o-notch fa-spin"/>Please wait...</span>
                     </t>
                     <t t-else="">
-                        <div class="o_MessagingMenu_dropdownMenuHeader" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }">
-                            <t t-if="!env.messaging.device.isMobile">
+                        <div class="o_MessagingMenu_dropdownMenuHeader" t-att-class="{ 'o-mobile': messagingMenu.messaging.device.isMobile }">
+                            <t t-if="!messagingMenu.messaging.device.isMobile">
                                 <t t-foreach="['all', 'chat', 'channel']" t-as="tabId" t-key="tabId">
                                     <button class="o_MessagingMenu_tabButton o-desktop btn btn-link" t-att-class="{ 'o-active': messagingMenu.activeTabId === tabId, }" t-on-click="_onClickDesktopTabButton" type="button" role="tab" t-att-data-tab-id="tabId">
                                         <t t-if="tabId === 'all'">All</t>
@@ -30,14 +30,14 @@
                                     </button>
                                 </t>
                             </t>
-                            <t t-if="env.messaging.device.isMobile">
+                            <t t-if="messagingMenu.messaging.device.isMobile">
                                 <t t-call="mail.MessagingMenu.newMessageButton"/>
                             </t>
                             <div class="o-autogrow"/>
-                            <t t-if="!env.messaging.device.isMobile and !discuss.isOpen">
+                            <t t-if="!messagingMenu.messaging.device.isMobile and !discuss.isOpen">
                                 <t t-call="mail.MessagingMenu.newMessageButton"/>
                             </t>
-                            <t t-if="env.messaging.device.isMobile and messagingMenu.isMobileNewMessageToggled">
+                            <t t-if="messagingMenu.messaging.device.isMobile and messagingMenu.isMobileNewMessageToggled">
                                 <AutocompleteInput
                                     class="o_MessagingMenu_mobileNewMessageInput"
                                     customClass="id + '_mobileNewMessageInputAutocomplete'"
@@ -51,10 +51,10 @@
                         </div>
                         <NotificationList
                             class="o_MessagingMenu_notificationList"
-                            t-att-class="{ 'o-mobile': env.messaging.device.isMobile }"
+                            t-att-class="{ 'o-mobile': messagingMenu.messaging.device.isMobile }"
                             filter="messagingMenu.activeTabId"
                         />
-                        <t t-if="env.messaging.device.isMobile">
+                        <t t-if="messagingMenu.messaging.device.isMobile">
                             <MobileMessagingNavbar
                                 class="o_MessagingMenu_mobileNavbar"
                                 activeTabId="messagingMenu.activeTabId"
@@ -71,9 +71,9 @@
     <t t-name="mail.MessagingMenu.newMessageButton" owl="1">
         <button class="o_MessagingMenu_newMessageButton btn"
             t-att-class="{
-                'btn-link': !env.messaging.device.isMobile,
-                'btn-secondary': env.messaging.device.isMobile,
-                'o-mobile': env.messaging.device.isMobile,
+                'btn-link': !messagingMenu.messaging.device.isMobile,
+                'btn-secondary': messagingMenu.messaging.device.isMobile,
+                'o-mobile': messagingMenu.messaging.device.isMobile,
             }" t-on-click="_onClickNewMessage" type="button"
         >
             New message
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 ed70ab1b463..588c9c0a8d1 100644
--- a/addons/mail/static/src/components/notification_group/notification_group.js
+++ b/addons/mail/static/src/components/notification_group/notification_group.js
@@ -54,8 +54,8 @@ export class NotificationGroup extends Component {
             return;
         }
         this.group.openDocuments();
-        if (!this.env.messaging.device.isMobile) {
-            this.env.messaging.messagingMenu.close();
+        if (!this.group.messaging.device.isMobile) {
+            this.group.messaging.messagingMenu.close();
         }
     }
 
@@ -65,8 +65,8 @@ export class NotificationGroup extends Component {
      */
     _onClickMarkAsRead(ev) {
         this.group.openCancelAction();
-        if (!this.env.messaging.device.isMobile) {
-            this.env.messaging.messagingMenu.close();
+        if (!this.group.messaging.device.isMobile) {
+            this.group.messaging.messagingMenu.close();
         }
     }
 
diff --git a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml b/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml
index e184fc7886c..c47eb74f16f 100644
--- a/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml
+++ b/addons/mail/static/src/components/partner_im_status_icon/partner_im_status_icon.xml
@@ -5,7 +5,7 @@
         <span class="o_PartnerImStatusIcon fa-stack"
             t-att-class="{
                 'o-away': partner and partner.im_status === 'away',
-                'o-bot': partner and env.messaging.partnerRoot === partner,
+                'o-bot': partner and partner.messaging.partnerRoot === partner,
                 'o-has-open-chat': props.hasOpenChat,
                 'o-offline': partner and partner.im_status === 'offline',
                 'o-online': partner and partner.im_status === 'online',
@@ -27,7 +27,7 @@
                 <t t-if="partner.im_status === 'offline'">
                     <i class="o_PartnerImStatusIcon_icon o-offline fa fa-circle-o fa-stack-1x" title="Offline" role="img" aria-label="User is offline"/>
                 </t>
-                <t t-if="partner === env.messaging.partnerRoot">
+                <t t-if="partner === partner.messaging.partnerRoot">
                     <i class="o_PartnerImStatusIcon_icon o-bot fa fa-heart fa-stack-1x" title="Bot" role="img" aria-label="User is a bot"/>
                 </t>
             </t>
diff --git a/addons/mail/static/src/components/thread_icon/thread_icon.xml b/addons/mail/static/src/components/thread_icon/thread_icon.xml
index 0bacff5ebb7..f875fc0a1b0 100644
--- a/addons/mail/static/src/components/thread_icon/thread_icon.xml
+++ b/addons/mail/static/src/components/thread_icon/thread_icon.xml
@@ -30,7 +30,7 @@
                     <t t-elif="thread.correspondent.im_status === 'away'">
                         <div class="o_ThreadIcon_away fa fa-circle" title="Away"/>
                     </t>
-                    <t t-elif="thread.correspondent === env.messaging.partnerRoot">
+                    <t t-elif="thread.correspondent === thread.messaging.partnerRoot">
                         <div class="o_ThreadIcon_online fa fa-heart" title="Bot"/>
                     </t>
                     <t t-else="" name="noImStatusCondition">
@@ -38,13 +38,13 @@
                     </t>
                 </t>
                 <t t-elif="thread.model === 'mail.box'">
-                    <t t-if="thread === env.messaging.inbox">
+                    <t t-if="thread === thread.messaging.inbox">
                         <div class="o_ThreadIcon_mailboxInbox fa fa-inbox"/>
                     </t>
-                    <t t-elif="thread === env.messaging.starred">
+                    <t t-elif="thread === thread.messaging.starred">
                         <div class="o_ThreadIcon_mailboxStarred fa fa-star-o"/>
                     </t>
-                    <t t-elif="thread === env.messaging.history">
+                    <t t-elif="thread === thread.messaging.history">
                         <div class="o_ThreadIcon_mailboxHistory fa fa-history"/>
                     </t>
                 </t>
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 ee587277b5e..670a453c97c 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
@@ -77,8 +77,8 @@ export class ThreadNeedactionPreview extends Component {
             return;
         }
         this.thread.open();
-        if (!this.env.messaging.device.isMobile) {
-            this.env.messaging.messagingMenu.close();
+        if (!this.thread.messaging.device.isMobile) {
+            this.thread.messaging.messagingMenu.close();
         }
     }
 
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 a77da68b617..800559960fe 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
@@ -15,7 +15,7 @@
                             <PartnerImStatusIcon
                                 class="o_ThreadNeedactionPreview_partnerImStatusIcon"
                                 t-att-class="{
-                                    'o-mobile': env.messaging.device.isMobile,
+                                    'o-mobile': thread.messaging.device.isMobile,
                                 }"
                                 partnerLocalId="thread.correspondent.localId"
                             />
@@ -24,7 +24,7 @@
                 </div>
                 <div class="o_ThreadNeedactionPreview_content">
                     <div class="o_ThreadNeedactionPreview_header">
-                        <span class="o_ThreadNeedactionPreview_name text-truncate" t-att-class="{ 'o-mobile': env.messaging.device.isMobile }">
+                        <span class="o_ThreadNeedactionPreview_name text-truncate" t-att-class="{ 'o-mobile': thread.messaging.device.isMobile }">
                             <t t-esc="thread.displayName"/>
                         </span>
                         <span class="o_ThreadNeedactionPreview_counter">
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 5a6a02f7c76..514646b9692 100644
--- a/addons/mail/static/src/components/thread_preview/thread_preview.js
+++ b/addons/mail/static/src/components/thread_preview/thread_preview.js
@@ -71,8 +71,8 @@ export class ThreadPreview extends Component {
             return;
         }
         this.thread.open();
-        if (!this.env.messaging.device.isMobile) {
-            this.env.messaging.messagingMenu.close();
+        if (!this.thread.messaging.device.isMobile) {
+            this.thread.messaging.messagingMenu.close();
         }
     }
 
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 ec033843a3b..80960e45ebd 100644
--- a/addons/mail/static/src/components/thread_preview/thread_preview.xml
+++ b/addons/mail/static/src/components/thread_preview/thread_preview.xml
@@ -15,7 +15,7 @@
                             <PartnerImStatusIcon
                                 class="o_ThreadPreview_partnerImStatusIcon"
                                 t-att-class="{
-                                    'o-mobile': env.messaging.device.isMobile,
+                                    'o-mobile': thread.messaging.device.isMobile,
                                     'o-muted': thread.localMessageUnreadCounter === 0,
                                 }"
                                 partnerLocalId="thread.correspondent.localId"
@@ -25,7 +25,7 @@
                 </div>
                 <div class="o_ThreadPreview_content">
                     <div class="o_ThreadPreview_header">
-                        <span class="o_ThreadPreview_name text-truncate" t-att-class="{ 'o-mobile': env.messaging.device.isMobile, 'o-muted': thread.localMessageUnreadCounter === 0 }">
+                        <span class="o_ThreadPreview_name text-truncate" t-att-class="{ 'o-mobile': thread.messaging.device.isMobile, 'o-muted': thread.localMessageUnreadCounter === 0 }">
                             <t t-esc="thread.displayName"/>
                         </span>
                         <t t-if="thread.localMessageUnreadCounter > 0">
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 4fd3f879932..e422bf5f458 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
@@ -31,10 +31,10 @@
                     </t>
                 </div>
                 <div class="o_ThreadViewTopbar_actions d-flex align-items-center">
-                    <t t-if="threadViewTopBar.thread and threadViewTopBar.thread === env.messaging.inbox">
+                    <t t-if="threadViewTopBar.thread and threadViewTopBar.thread === threadViewTopBar.messaging.inbox">
                         <button class="o_ThreadViewTopbar_markAllReadButton btn btn-secondary" t-att-disabled="threadViewTopBar.threadView.messages.length === 0" t-on-click="threadViewTopBar.onClickInboxMarkAllAsRead">Mark all read</button>
                     </t>
-                    <t t-if="threadViewTopBar.thread and threadViewTopBar.thread === env.messaging.starred">
+                    <t t-if="threadViewTopBar.thread and threadViewTopBar.thread === threadViewTopBar.messaging.starred">
                         <button class="o_ThreadViewTopbar_unstarAllButton btn btn-secondary" t-att-disabled="threadViewTopBar.threadView.messages.length === 0" t-on-click="threadViewTopBar.onClickUnstarAll">Unstar all</button>
                     </t>
                     <t t-if="threadViewTopBar.thread and threadViewTopBar.thread.hasInviteFeature">
diff --git a/addons/mail/static/src/models/chat_window/chat_window.js b/addons/mail/static/src/models/chat_window/chat_window.js
index 0fbed9a4299..bd6b5b47811 100644
--- a/addons/mail/static/src/models/chat_window/chat_window.js
+++ b/addons/mail/static/src/models/chat_window/chat_window.js
@@ -36,7 +36,6 @@ function factory(dependencies) {
                 this.thread.notifyFoldStateToServer('closed');
             }
             if (this.exists()) {
-                // notifyFoldStateToServer() might have deleted it already
                 this.delete();
             }
         }
diff --git a/addons/snailmail/static/src/components/message/message.js b/addons/snailmail/static/src/components/message/message.js
index 7cb1280db25..98a768b6e65 100644
--- a/addons/snailmail/static/src/components/message/message.js
+++ b/addons/snailmail/static/src/components/message/message.js
@@ -37,7 +37,7 @@ patch(Message.prototype, 'snailmail/static/src/components/message/message.js', {
             switch (this.message.notifications[0].failure_type) {
                 case 'sn_credit':
                     // URL only used in this component, not received at init
-                    this.env.messaging.fetchSnailmailCreditsUrl();
+                    this.message.messaging.fetchSnailmailCreditsUrl();
                     this.snailmailState.hasDialog = true;
                     break;
                 case 'sn_error':
@@ -54,7 +54,7 @@ patch(Message.prototype, 'snailmail/static/src/components/message/message.js', {
                     break;
                 case 'sn_trial':
                     // URL only used in this component, not received at init
-                    this.env.messaging.fetchSnailmailCreditsUrlTrial();
+                    this.message.messaging.fetchSnailmailCreditsUrlTrial();
                     this.snailmailState.hasDialog = true;
                     break;
             }
diff --git a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml
index bf4f026e6d5..dc0a4d412b0 100644
--- a/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml
+++ b/addons/snailmail/static/src/components/snailmail_error_dialog/snailmail_error_dialog.xml
@@ -8,9 +8,9 @@
                     <p class="o_SnailmailErrorDialog_contentCredit">
                         The letter could not be sent due to insufficient credits on your IAP account.
                     </p>
-                    <t t-if="env.messaging.snailmail_credits_url">
+                    <t t-if="message.messaging.snailmail_credits_url">
                         <div class="text-right">
-                            <a class="btn btn-link" t-att-href="env.messaging.snailmail_credits_url" target="_blank">
+                            <a class="btn btn-link" t-att-href="message.messaging.snailmail_credits_url" target="_blank">
                                 <i class="fa fa-arrow-right"/> Buy credits
                             </a>
                         </div>
@@ -20,9 +20,9 @@
                     <p class="o_SnailmailErrorDialog_contentTrial">
                         You need credits on your IAP account to send a letter.
                     </p>
-                    <t t-if="env.messaging.snailmail_credits_url_trial">
+                    <t t-if="message.messaging.snailmail_credits_url_trial">
                         <div class="text-right">
-                            <a class="btn btn-link" t-att-href="env.messaging.snailmail_credits_url_trial">
+                            <a class="btn btn-link" t-att-href="message.messaging.snailmail_credits_url_trial">
                                 <i class="fa fa-arrow-right"/> Buy credits
                             </a>
                         </div>