1 files changed, 3 insertions, 1 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 716b86400be..f4bf9533ff9 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
@@ -292,7 +292,9 @@ var AbstractThreadWindow = Widget.extend({
     updateVisualFoldState: function () {
         if (!this.isFolded()) {
             this._threadWidget.scrollToBottom();
-            this._focusInput();
+            if (this.options.autofocus) {
+                this._focusInput();
+            }
         }
         this._animateFold();
     },