[MERGE] forward port branch saas-12.3 up to 6f55fd65da8

5 files changed, 5 insertions, 3 deletions

diff --git a/addons/mail/static/src/js/models/threads/document_thread.js b/addons/mail/static/src/js/models/threads/document_thread.js
index b4f1df097cf..0ef02e5f57a 100644
--- a/addons/mail/static/src/js/models/threads/document_thread.js
+++ b/addons/mail/static/src/js/models/threads/document_thread.js
@@ -97,7 +97,6 @@ var DocumentThread = Thread.extend({
     fetchMessages: function (options) {
         var self = this;
         return this._fetchMessages(options).then(function () {
-            self.call('mail_service', 'markMessagesAsRead', self._messageIDs);
             return self._messages;
         });
     },
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index 4a20d24af8d..3ed4031abeb 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -85,7 +85,7 @@ var MailManager =  AbstractService.extend({
     addMessage: function (data, options) {
         options = options || {};
         var message = this.getMessage(data.id);
-        var prom = Promise.resolve();
+        var prom;
         if (!message) {
             prom = this._addNewMessage(data, options);
         } else {
@@ -95,6 +95,7 @@ var MailManager =  AbstractService.extend({
                 });
             }
             this._addMessageToThreads(message, options);
+            prom = Promise.resolve(message);
         }
         return prom;
     },
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 5cc965b5c7a..a832b0b0793 100644
--- a/addons/mail/static/src/js/services/mail_window_manager.js
+++ b/addons/mail/static/src/js/services/mail_window_manager.js
@@ -106,7 +106,7 @@ MailManager.include({
             // This may happen due to concurrent calls to this method from
             // messaging menu preview click and handling of longpolling chat
             // window state.
-            return;
+            return Promise.resolve();
         }
         var threadWindow = this._getThreadWindow(threadID);
         var prom = Promise.resolve();
diff --git a/addons/mail/static/src/js/systray/systray_activity_menu.js b/addons/mail/static/src/js/systray/systray_activity_menu.js
index fae95a78c2f..641ff4be1bc 100644
--- a/addons/mail/static/src/js/systray/systray_activity_menu.js
+++ b/addons/mail/static/src/js/systray/systray_activity_menu.js
@@ -108,6 +108,7 @@ var ActivityMenu = Widget.extend({
      */
     _onActivityActionClick: function (ev) {
         ev.stopPropagation();
+        this.$('.dropdown-toggle').dropdown('toggle');
         var targetAction = $(ev.currentTarget);
         var actionXmlid = targetAction.data('action_xmlid');
         if (actionXmlid) {
diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss
index 6092ab733fc..8284fdc70b5 100644
--- a/addons/mail/static/src/scss/discuss.scss
+++ b/addons/mail/static/src/scss/discuss.scss
@@ -110,6 +110,7 @@
         }
 
         .o_mail_thread {
+            position: relative;
             flex: 1 0 0;
             overflow: auto;
             -webkit-overflow-scrolling: touch; // smooth scrolling in iOS app (Safari)