diff --git a/CHANGELOG b/CHANGELOG
index b0518335d..2d0930c6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix newly attached files are not saved in drafts w/o editing any text (#1486202)
 - Added attachment upload indicator with parallel upload (#1486058)
 - Use default_charset for bodies of messages without charset definition (#1486187)
 - Password: added cPanel driver
diff --git a/program/js/app.js b/program/js/app.js
index d72f9eebb..68011bdda 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2283,10 +2283,14 @@ function rcube_webmail()
       str += editor.getContent();
     else
       str += $("[name='_message']").val();
-    
+
+    if (this.env.attachments)
+      for (var upload_id in this.env.attachments)
+        str += upload_id;
+
     if (save)
       this.cmp_hash = str;
-    
+
     return str;
     };