diff --git a/CHANGELOG b/CHANGELOG
index f50266556..6834fa8d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+
+- Fix issue where signature wasn't re-added on draft compose (#1488322)
 - Update to TinyMCE 3.5 (#1488459)
 - Fixed multi-threaded autocompletion when number of threads > number of sources
 - Allow to configure the number of values allowed for each LDAP attribute
diff --git a/program/js/app.js b/program/js/app.js
index 487d718e3..3518712ed 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2988,7 +2988,7 @@ function rcube_webmail()
       this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
       // add signature according to selected identity
       // if we have HTML editor, signature is added in callback
-      if (input_from.prop('type') == 'select-one' && $("input[name='_draft_saveid']").val() == '') {
+      if (input_from.prop('type') == 'select-one') {
         this.change_identity(input_from[0]);
       }
     }