[MERGE] forward port branch saas-16 up to 4ca3d9cadf9

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/mail/static/src/js/thread_field.js b/addons/mail/static/src/js/thread_field.js
index 481dc49af36..0d7635cae8b 100644
--- a/addons/mail/static/src/js/thread_field.js
+++ b/addons/mail/static/src/js/thread_field.js
@@ -21,7 +21,7 @@ var ThreadField = AbstractField.extend(chat_mixin, {
         this.msgIDs = this.value.res_ids;
     },
     willStart: function () {
-        return this._chatReady();
+        return this.alive(this._chatReady());
     },
     start: function () {
         var self = this;
@@ -43,7 +43,7 @@ var ThreadField = AbstractField.extend(chat_mixin, {
         var def1 = this.thread.appendTo(this.$el);
         var def2 = this._super.apply(this, arguments);
 
-        return $.when(def1, def2).then(function () {
+        return this.alive($.when(def1, def2)).then(function () {
             // unwrap the thread to remove an unnecessary level on div
             self.setElement(self.thread.$el);