3 files changed, 21 insertions, 3 deletions
diff --git a/skins/default/common.css b/skins/default/common.css
index b1696ef85..6f1f264b7 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -490,6 +490,11 @@ body.iframe .boxtitle
   background-color: #c00;
 }
 
+.popupmenu li input
+{
+  float: left;
+}
+
 .darkbg
 {
   background-color: #F2F2F2 !important;
diff --git a/skins/default/functions.js b/skins/default/functions.js
index c1dd8c2ab..9057d97c4 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -148,6 +148,13 @@ dragmessagemenu: function(show)
   this.popups.dragmessagemenu.obj[show?'show':'hide']();
 },
 
+forwardmenu: function(show)
+{
+  $("input[name='forwardtype'][value="+(rcmail.env.forward_attachment ? 1 : 0)+"]", this.popups.forwardmenu.obj)
+    .prop('checked', true);
+  this.show_popupmenu('forwardmenu', show);
+},
+
 uploadmenu: function(show)
 {
   if (typeof show == 'object') // called as event handler
diff --git a/skins/default/includes/messagetoolbar.html b/skins/default/includes/messagetoolbar.html
index dcc27caea..2ac23a12b 100644
--- a/skins/default/includes/messagetoolbar.html
+++ b/skins/default/includes/messagetoolbar.html
@@ -26,9 +26,15 @@
 </div>
 
 <div id="forwardmenu" class="popupmenu">
-    <ul>
-        <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
-        <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
+    <ul class="toolbarmenu">
+        <li>
+            <input type="radio" name="forwardtype" value="0" onchange="rcmail.command('save-pref', {name: 'forward_attachment', value: 0, env: 'forward_attachment'});" />
+            <roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" />
+        </li>
+        <li>
+            <input type="radio" name="forwardtype" value="1" onchange="rcmail.command('save-pref', {name: 'forward_attachment', value: 1, env: 'forward_attachment'})" />
+            <roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" />
+        </li>    
         <roundcube:container name="forwardmenu" id="forwardmenu" />
     </ul>
 </div>