Fix unintentional draft autosave request if autosave is disabled (#1489882)

Conflicts:

	CHANGELOG

2 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6d41d874e..b62bb2ebe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Add configurable LDAP_OPT_DEREF option (#1489864)
+- Fix unintentional draft autosave request if autosave is disabled (#1489882)
 
 RELEASE 1.0.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index 0f76da01e..f0ad2ab5f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3644,12 +3644,13 @@ function rcube_webmail()
 
   this.auto_save_start = function()
   {
-    if (this.env.draft_autosave)
+    if (this.env.draft_autosave) {
       this.draft_autosave_submit = false;
       this.save_timer = setTimeout(function(){
           ref.draft_autosave_submit = true;  // set auto-saved flag (#1489789)
           ref.command("savedraft");
       }, this.env.draft_autosave * 1000);
+    }
 
     // save compose form content to local storage every 5 seconds
     if (!this.local_save_timer && window.localStorage) {