- Add option to set default action of Forward button to "Forward as attachment"

git-svn-id: https://svn.roundcube.net/trunk@4775 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 4 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 3f103de65..c4aa50995 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -931,10 +931,13 @@ function rcube_webmail()
 
       case 'forward-attachment':
       case 'forward':
-        var uid;
-        if (uid = this.get_single_uid())
-          this.goto_url('compose', '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)
-            + (command == 'forward-attachment' ? '&_attachment=1' : ''), true);
+        var uid, url;
+        if (uid = this.get_single_uid()) {
+          url = '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+          if (command == 'forward-attachment' || (!props && this.env.forward_attachment))
+            url += '&_attachment=1';
+          this.goto_url('compose', url, true);
+        }
         break;
 
       case 'print':