From d409a545c2ec28b57711c4a6ee6f66b4916932b7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 14 Sep 2012 08:31:39 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/js/app.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 48de217..2182a2b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -669,7 +669,7 @@
           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;

--
Gitblit v1.9.1