summaryrefslogtreecommitdiff
path: root/program/js/app.js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-14 14:31:39 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-14 14:31:39 +0200
commitd409a545c2ec28b57711c4a6ee6f66b4916932b7 (patch)
tree9e69ff298cafbe78c1abca0aa6491e1c85f89712 /program/js/app.js
parentbf1d94076ddf79df7787f89ff373666d6fbcf30f (diff)
parentc563c2cc26bd947a5ccee6cae13dc11047d69f09 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts: CHANGELOG
Diffstat (limited to 'program/js/app.js')
-rw-r--r--program/js/app.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 48de21764..2182a2b88 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -669,7 +669,7 @@ function rcube_webmail()
this.load_identity(props, 'edit-identity');
else if (this.task == 'mail' && (cid = this.get_single_uid())) {
url = { _mbox: this.env.mailbox };
- url[this.env.mailbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid'] = cid;
+ url[this.env.mailbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = cid;
this.goto_url('compose', url, true);
}
break;