diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 823462b9921fc8f783ac8e0d58f4c788f81818ae..163683cd0e3c3bc3624df039983d30dbaffa6659 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -3,9 +3,10 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 $user = OCP\USER::getUser();
 // TODO translations
-$subject = $user.' shared a file with you';
+$type = (strpos($_POST['file'], '.') === false) ? 'folder' : 'file';
+$subject = $user.' shared a '.$type.' with you';
 $link = $_POST['link'];
-$text = $user.' shared the file '.$_POST['file'].' with you. It is available for download here: '.$link;
+$text = $user.' shared the '.$type.' '.$_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);