diff --git a/services/settings/pkg/store/defaults/defaults.go b/services/settings/pkg/store/defaults/defaults.go
index 32a85bb68..1a1d47e55 100644
--- a/services/settings/pkg/store/defaults/defaults.go
+++ b/services/settings/pkg/store/defaults/defaults.go
@@ -500,7 +500,7 @@ var optionInAppTrue = settingsmsg.MultiChoiceCollectionOption{
 
 var optionMailTrue = settingsmsg.MultiChoiceCollectionOption{
 	Key:          "mail",
-	DisplayValue: "Mail",
+	DisplayValue: "Email",
 	Value: &settingsmsg.MultiChoiceCollectionOptionValue{
 		Option: &settingsmsg.MultiChoiceCollectionOptionValue_BoolValue{
 			BoolValue: &settingsmsg.Bool{
@@ -513,7 +513,7 @@ var optionMailTrue = settingsmsg.MultiChoiceCollectionOption{
 var optionMailFalseDisabled = settingsmsg.MultiChoiceCollectionOption{
 	Key:          "mail",
 	Attribute:    "disabled",
-	DisplayValue: "Mail",
+	DisplayValue: "Email",
 	Value: &settingsmsg.MultiChoiceCollectionOptionValue{
 		Option: &settingsmsg.MultiChoiceCollectionOptionValue_BoolValue{
 			BoolValue: &settingsmsg.Bool{
diff --git a/services/settings/pkg/store/defaults/templates.go b/services/settings/pkg/store/defaults/templates.go
index 0158fe91e..b07c41a6a 100644
--- a/services/settings/pkg/store/defaults/templates.go
+++ b/services/settings/pkg/store/defaults/templates.go
@@ -7,43 +7,43 @@ var (
 	// name of the notification option 'Share Received'
 	TemplateShareCreated = l10n.Template("Share Received")
 	// description of the notification option 'Share Received'
-	TemplateShareCreatedDescription = l10n.Template("Notify me when I receive a share")
+	TemplateShareCreatedDescription = l10n.Template("Notify when I have received a share")
 	// name of the notification option 'Share Removed'
 	TemplateShareRemoved = l10n.Template("Share Removed")
 	// description of the notification option 'Share Removed'
-	TemplateShareRemovedDescription = l10n.Template("Notify me when my shares are removed")
+	TemplateShareRemovedDescription = l10n.Template("Notify when a received share has been removed")
 	// name of the notification option 'Share Expired'
 	TemplateShareExpired = l10n.Template("Share Expired")
 	// description of the notification option 'Share Expired'
-	TemplateShareExpiredDescription = l10n.Template("Notify me when my shares expire")
+	TemplateShareExpiredDescription = l10n.Template("Notify when a received share has expired")
 	// name of the notification option 'Space Shared'
 	TemplateSpaceShared = l10n.Template("Added as space member")
 	// description of the notification option 'Space Shared'
-	TemplateSpaceSharedDescription = l10n.Template("Notify me when I am added as a member to a space")
+	TemplateSpaceSharedDescription = l10n.Template("Notify when I have been added as a member to a space")
 	// name of the notification option 'Space Unshared'
 	TemplateSpaceUnshared = l10n.Template("Removed as space member")
 	// description of the notification option 'Space Unshared'
-	TemplateSpaceUnsharedDescription = l10n.Template("Notify me when I am removed as a member from a space")
+	TemplateSpaceUnsharedDescription = l10n.Template("Notify when I have been removed as member from a space")
 	// name of the notification option 'Space Membership Expired'
 	TemplateSpaceMembershipExpired = l10n.Template("Space membership expired")
 	// description of the notification option 'Space Membership Expired'
-	TemplateSpaceMembershipExpiredDescription = l10n.Template("Notify me when my membership of a space expires")
+	TemplateSpaceMembershipExpiredDescription = l10n.Template("Notify when a space membership has expired")
 	// name of the notification option 'Space Disabled'
 	TemplateSpaceDisabled = l10n.Template("Space disabled")
 	// description of the notification option 'Space Disabled'
-	TemplateSpaceDisabledDescription = l10n.Template("Notify me when a space I am a member of is disabled")
+	TemplateSpaceDisabledDescription = l10n.Template("Notify when a space I am member of has been disabled")
 	// name of the notification option 'Space Deleted'
 	TemplateSpaceDeleted = l10n.Template("Space deleted")
 	// description of the notification option 'Space Deleted'
-	TemplateSpaceDeletedDescription = l10n.Template("Notify me when a space I am a member of is deleted")
+	TemplateSpaceDeletedDescription = l10n.Template("Notify when a space I am member of has been deleted")
 	// name of the notification option 'File Rejected'
 	TemplateFileRejected = l10n.Template("File rejected")
 	// description of the notification option 'File Rejected'
-	TemplateFileRejectedDescription = l10n.Template("Notify me when a file I uploaded is rejected because of virus infection or policy violation")
+	TemplateFileRejectedDescription = l10n.Template("Notify when a file I uploaded was rejected because of a virus infection or policy violation")
 	// name of the notification option 'Email Interval'
 	TemplateEmailSendingInterval = l10n.Template("Email sending interval")
 	// description of the notification option 'Email Interval'
-	TemplateEmailSendingIntervalDescription = l10n.Template("Notifiy me via email:")
+	TemplateEmailSendingIntervalDescription = l10n.Template("Selected value:")
 	// translation for the 'instant' email interval option
 	TemplateIntervalInstant = l10n.Template("Instant")
 	// translation for the 'daily' email interval option