2 files changed, 4 insertions, 27 deletions
diff --git a/addons/mail/static/src/js/thread_windows/abstract_thread_window.js b/addons/mail/static/src/js/thread_windows/abstract_thread_window.js
index d6a637a0552..27cb97e1f65 100644
--- a/addons/mail/static/src/js/thread_windows/abstract_thread_window.js
+++ b/addons/mail/static/src/js/thread_windows/abstract_thread_window.js
@@ -147,32 +147,10 @@ var AbstractThreadWindow = Widget.extend({
      * @returns {mail.model.Thread|undefined}
      */
     getThread: function () {
-        if (!this.hasThread) {
-            return undefined;
-        }
-        return this._thread;
-    },
-    /**
-    *Get out of office info
-    *
-    * @returns {string|undefined}
-    */
-    getOutOfOfficeInfo: function () {
-        if (!this.hasThread()) {
-            return undefined;
-        }
-        return this._thread.getOutOfOfficeInfo();
-    },
-    /**
-     * Get out of office user text
-     *
-     * @returns {string|undefined}
-     */
-    getOutOfOfficeMessage: function () {
         if (!this.hasThread()) {
             return undefined;
         }
-        return this._thread.getOutOfOfficeMessage();
+        return this._thread;
     },
     /**
      * Get the status of the thread, such as the im status of a DM chat
diff --git a/addons/mail/static/src/js/thread_windows/thread_window.js b/addons/mail/static/src/js/thread_windows/thread_window.js
index 08671354a3e..8b4eb03d9db 100644
--- a/addons/mail/static/src/js/thread_windows/thread_window.js
+++ b/addons/mail/static/src/js/thread_windows/thread_window.js
@@ -148,15 +148,14 @@ var ThreadWindow = AbstractThreadWindow.extend({
     },
     renderOutOfOffice: function () {
         var $outOfOffice = this.$('.o_out_of_office');
-        if (!this.getOutOfOfficeInfo() && !this.getOutOfOfficeMessage()) {
+        const thread = this.getThread();
+        if (!thread.hasOutOfOffice()) {
             if ($outOfOffice.length) {
                 $outOfOffice.remove();
             }
             return;
         }
-        var $newOutOfOffice = $(QWeb.render('mail.thread_window.OutOfOffice', {
-            widget: this,
-        }));
+        const $newOutOfOffice = $(QWeb.render('mail.thread.OutOfOffice', { thread }));
         if ($outOfOffice.length) {
             $outOfOffice.replaceWith($newOutOfOffice);
         } else {