Merge branch 'master' of github.com:roundcube/roundcubemail

1 files changed, 6 insertions, 2 deletions

diff --git a/program/js/app.js b/program/js/app.js
index e00479f90..b4e11b9d8 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1052,7 +1052,7 @@ function rcube_webmail()
         if (this.task == 'mail') {
           url._mbox = this.env.mailbox;
           if (props)
-             url._to = props;
+            url._to = props;
           // also send search request so we can go back to search result after message is sent
           if (this.env.search_request)
             url._search = this.env.search_request;
@@ -1080,8 +1080,12 @@ function rcube_webmail()
             break;
           }
         }
-        else if (props)
+        else if (props && typeof props == 'string') {
           url._to = props;
+        }
+        else if (props && typeof props == 'object') {
+          $.extend(url, props);
+        }
 
         this.open_compose_step(url);
         break;