Better fix for "saving draft just after entering compose window (#1489012)"

program/js/app.js

@@ -950,7 +950,7 @@ function rcube_webmail()
         clearTimeout(this.save_timer);
 
         // compose form did not change (and draft wasn't saved already)
-        if (this.draft_saved && this.cmp_hash == this.compose_field_hash()) {
+        if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
           this.auto_save_start();
           break;
         }
@@ -3345,7 +3345,7 @@ function rcube_webmail()
 
   this.set_draft_id = function(id)
   {
-    this.draft_saved = id;
+    this.env.draft_id = id;
     $("input[name='_draft_saveid']").val(id);
   };
 

program/steps/mail/compose.inc

@@ -152,6 +152,7 @@ if ($font && !is_array($font)) {
 // get reference message and set compose mode
 if ($msg_uid = $COMPOSE['param']['draft_uid']) {
   $compose_mode = RCUBE_COMPOSE_DRAFT;
+  $OUTPUT->set_env('draft_id', $msg_uid);
   $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
 }
 else if ($msg_uid = $COMPOSE['param']['reply_uid']) {