diff --git a/mail/js/app.js b/mail/js/app.js
index ffd66d25bc..72efc2da2a 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -5299,6 +5299,7 @@ app.classes.mail = AppJS.extend(
 	{
 		if (this.compose_integrate_submit() && _action) return false;
 
+		if (_action.id == 'send') this.saveAsDraft(null, 'autosaving');
 		if (this.mailvelope_editor)
 		{
 			var self = this;