diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index 00b67bee456e75783dc3fea8ccf9abf64eb04214..7776919ea342c3f9fb0e541e055f33299dffdc2c 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,7 +1,8 @@
 <?php
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.\n\n", array($_['expiration'])));
+	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped('\n\n');
 }
 p($l->t("Cheers!"));
 ?>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 40092f5491f88aa3f19156e975bb86b5ddecd1fd..4fa54aa5283f77b070da1b4a5a73da696195bbb8 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -14,7 +14,8 @@
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.<br><br>", array($_['expiration'])));
+	p($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped('<br><br>');
 }
 p($l->t('Cheers!'));
 ?>
diff --git a/lib/private/files.php b/lib/private/files.php
index e76dd8644c1cc1d2072c31aaf6d761cb5c3e0fe9..8b8ff81ec5ed83dd53ef7d772e9201aac0753ac3 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -253,7 +253,7 @@ class OC_Files {
 				header("HTTP/1.0 409 Conflict");
 				OC_Template::printErrorPage(
 						$l->t('Selected files too large to generate zip file.'),
-						$l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.')
+						$l->t('Please download the files separately in smaller chunks or kindly ask your administrator.')
 						.'<br/><a href="javascript:history.back()">'
 						. $l->t('Back to Files') . '</a>'
 				);