Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 1971)
+++ /trunk/roundcubemail/CHANGELOG	(revision 1972)
@@ -6,4 +6,5 @@
 - Fix 'Empty' link visibility for some languages e.g. Slovak (#1485489)
 - Fix messages count bar overlapping (#1485270)
+- Fix adding signature in drafts compose mode (#1485484)
 
 2008/10/09 (alec)
Index: /trunk/roundcubemail/program/js/app.js
===================================================================
--- /trunk/roundcubemail/program/js/app.js	(revision 1971)
+++ /trunk/roundcubemail/program/js/app.js	(revision 1972)
@@ -424,4 +424,5 @@
     var input_subject = rcube_find_object('_subject');
     var input_message = rcube_find_object('_message');
+    var draftid = rcube_find_object('_draft_saveid');
 
     // init live search events
@@ -434,5 +435,5 @@
 
     // add signature according to selected identity
-    if (input_from && input_from.type=='select-one')
+    if (input_from && input_from.type=='select-one' && (!draftid || draftid.value==''))
       this.change_identity(input_from);