[MERGE] forward port branch saas-12.4 up to 98a55917a60

3 files changed, 3 insertions, 2 deletions

diff --git a/addons/mail/static/src/js/emojis.js b/addons/mail/static/src/js/emojis.js
index 54b995f3bb6..f8684cde541 100644
--- a/addons/mail/static/src/js/emojis.js
+++ b/addons/mail/static/src/js/emojis.js
@@ -73,6 +73,7 @@ var data = {
     "<3":          "❤️",
     ":heart":         "❤️", // alt.
     "</3":            "💔",
+    "&lt;/3":         "💔",
     ":heart_eyes":    "😍",
     ":turban":        "👳",
     ":+1":            "👍",
diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js
index 704e114d8bd..cbaaff8194b 100644
--- a/addons/mail/static/src/js/services/mail_notification_manager.js
+++ b/addons/mail/static/src/js/services/mail_notification_manager.js
@@ -508,7 +508,7 @@ MailManager.include({
             }
             this._removeChannel(channel);
             this._mailBus.trigger('unsubscribe_from_channel', data.id);
-            this.do_notify(_("Unsubscribed"), message);
+            this.do_notify(_t("Unsubscribed"), message);
         }
     },
      /**
diff --git a/addons/mail/static/src/js/services/mail_window_manager.js b/addons/mail/static/src/js/services/mail_window_manager.js
index 81f0ef7e97c..5cc965b5c7a 100644
--- a/addons/mail/static/src/js/services/mail_window_manager.js
+++ b/addons/mail/static/src/js/services/mail_window_manager.js
@@ -114,9 +114,9 @@ MailManager.include({
             thread.isCreatingWindow = true;
             prom = thread.fetchMessages().then(function () {
                 threadWindow = self._makeNewThreadWindow(thread, options);
-                self._placeNewThreadWindow(threadWindow, options.passively);
                 return threadWindow.appendTo($(self.THREAD_WINDOW_APPENDTO));
             }).then(function () {
+                self._placeNewThreadWindow(threadWindow, options.passively);
                 self._repositionThreadWindows();
                 threadWindow.render();
                 threadWindow.scrollToBottom();