diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 9eba203465e0f17b3e9f918c2d7a2d47bebd0ec9..823462b9921fc8f783ac8e0d58f4c788f81818ae 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -3,9 +3,9 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 $user = OCP\USER::getUser();
 // TODO translations
-$subject = $user + ' ' + 'shared a file with you';
-$link = $_POST['link'] + '&f=' + $_POST['f'];
-$text = $user + ' ' + 'shared the file' + ' ' + $_POST['f'] + ' ' + 'with you.' + ' ' + 'It is available for download here:' + ' ' + $link;
+$subject = $user.' shared a file with you';
+$link = $_POST['link'];
+$text = $user.' shared the file '.$_POST['file'].' with you. It is available for download here: '.$link;
 $fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.$_SERVER['HTTP_HOST']);
 OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
 
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index dbf5588c4e36c9867b049f5edbc6c9996eeebc53..ac1209956d6e00e4ee7c78b7a1260c216f04066c 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -204,7 +204,9 @@ OC.Share={
 		$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
 			$(this).val('');
 		}).val('Email sent');
-		$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), 'toaddress='+$('#email').val()+'&link='+$('#link').val());
+		var link = $('#privateLinkText').val();
+		var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' ');
+		$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: $('#email').val(), link: link, file: file } );
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');