Signed-off-by: Jerome Jutteau <mojo@couak.net>
 
     // Email link
     var filename = document.getElementById('file_select').files[0].name;
-    var b = "Download%20%22" + filename + "%22 :%0D" + download_link_href + "%0D";
-    document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + filename;
+    var b = encodeURIComponent("Download file \"" + filename + "\":") + "%0D";
+    b += encodeURIComponent(download_link_href) + "%0D";
+    if (date)
+        b += "%0D" + encodeURIComponent("This file will be available until " + date) + "%0D";
+    document.getElementById('upload_link_email').href = "mailto:?body=" + b + "&subject=" + encodeURIComponent(filename);
 
     // Delete link
     var delete_link = url + 'f.php?h=' + reference + '&d=' + delete_code;
 
   <link href="<?php echo $web_root . 'media/' . $style . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<script language="Javascript" src="lib/functions_v6.js"></script>
+<script language="Javascript" src="lib/functions_v7.js"></script>
 <div id="content">
 <h1><a href="<?php echo $web_root; ?>"><?php echo t('Jirafeau, your web file repository'); ?></a></h1>