diff --git a/NEWS b/NEWS
index 7e95a375e..508c7e1b9 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Bug fixes
  - [web] really delete mailboxes being deleted from the Trash folder (#595, #1189, #641)
  - [web] fixed address autocompletion of mail editor affecting cards list of active addressbook
  - [web] fixed batched delete of components (#3516)
+ - [web] fixed mail draft autosave in preferences (#3519)
 
 3.0.1 (2016-02-05)
 ------------------
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 8c16d575c..886544db6 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -594,7 +594,8 @@
             <div layout="row" layout-align="start center">
               <p><var:string label:value="Auto save every"/></p>
               <md-input-container class="md-input-number" md-no-float="md-no-float">
-                <input type="number" min="0" label:aria-label="minutes" ng-model="preferences.defaults.SOGoMailAutoSave"/>
+                <input type="number" min="0" label:aria-label="minutes"
+                       ng-model="app.preferences.defaults.SOGoMailAutoSave"/>
               </md-input-container>
               <var:string label:value="minutes"/>
             </div>
diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js
index 4f5373087..ec383e088 100644
--- a/UI/WebServerResources/js/Preferences/Preferences.service.js
+++ b/UI/WebServerResources/js/Preferences/Preferences.service.js
@@ -23,6 +23,9 @@
 
       data.SOGoMailLabelsColors = labels;
 
+      // Mail editor autosave is a number of minutes or 0 if disabled
+      data.SOGoMailAutoSave = parseInt(data.SOGoMailAutoSave) || 0;
+
       // We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
       // We also convert our date objects into real date, otherwise we'll have strings
       // or undefined values and the md-datepicker does NOT like this.