diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index deb7b2f6f..e59d7e499 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1248,7 +1248,7 @@ function rcmail_message_part_controls()
   if (!empty($part->filename)) {
     $table->add('title', Q(rcube_label('filename')));
     $table->add(null, Q($part->filename));
-    $table->add(null, '[' . html::a(str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q(rcube_label('download'))) . ']');
+    $table->add(null, '[' . html::a('?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q(rcube_label('download'))) . ']');
   }
   
   if (!empty($part->size)) {