diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 84f27f32a..22879d45a 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -788,13 +788,13 @@ MailSheetActiveIntro courseName termDesc sheetName: You may now download #{sheet
 
 MailSubjectCourseRegistered csh: You were enrolled for #{csh}
 MailSubjectCourseRegisteredOther displayName csh: #{displayName} was enrolled for #{csh}
-MailSubjectCourseRegisteredIntro courseName termDesc: You were enrolled for the course “#{courseName}” (#{termDesc})
-MailSubjectCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course “#{courseName}” (#{termDesc}).
+MailCourseRegisteredIntro courseName termDesc: You were enrolled for the course “#{courseName}” (#{termDesc})
+MailCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} was enrolled for the course “#{courseName}” (#{termDesc}).
 
 MailSubjectExamResult csh examn: Results for #{examn} in #{csh} are now available
 MailExamResultIntro courseName termDesc examn: You may now view your result for #{examn} of the course #{courseName} (#{termDesc}).
 
-MailSubjectExamOfficeExamResults csh examn: Results for #{examn} of #{courseName} are now available
+MailSubjectExamOfficeExamResults csh examn: Results for #{examn} of #{csh} are now available
 MailExamOfficeExamResultsIntro courseName termDesc examn: A course administrator has made the results for #{examn} of the course #{courseName} (#{termDesc}) available.
 
 MailSubjectExamOfficeExamResultsChanged csh examn: Results for #{examn} of #{csh} were changed
@@ -803,7 +803,16 @@ MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course admini
 MailSubjectExamRegistrationActive csh examn: Registration is now allowed for #{examn} of #{csh}
 MailExamRegistrationActiveIntro courseName termDesc examn: You may now register for #{examn} of the course #{courseName} (#{termDesc}).
 
-MailSubjectExamRegistrationSoonInactive csh examn: Registration for #{examn} of #{csh} ends shortly
+MailSubjectExamRegistrationSoonInactive csh examn: The registration period for #{examn} of #{csh} ends shortly
+MailExamRegistrationSoonInactiveIntro courseName termDesc examn: Soon you will no longer be allowed to register for #{examn} of #{courseName} (#{termDesc}).
+
+MailSubjectSubmissionsUnassigned csh sheetName: Corrections for #{sheetName} of #{csh} could not be distributed
+MailSubmissionsUnassignedIntro n courseName termDesc sheetName: #{n} corrections for #{sheetName} of the course #{courseName} (#{termDesc}) could not be automatically distributed.
+
+MailSubjectSheetSoonInactive csh sheetName: The submission period for #{sheetName} of #{csh} ends shortly
+MailSheetSoonInactiveIntro courseName termDesc sheetName: Soon you will no longer be allowed to submit for #{sheetName} of the course #{courseName} (#{termDesc}).
+MailSubjectSheetInactive csh sheetName: The submission period for #{sheetName} of #{csh} has ended
+MailSheetInactiveIntro courseName termDesc sheetName n num: The submission period for #{sheetName} of the course #{courseName} (#{termDesc}) has ended. #{noneOneMoreEN num "" "One participant" (toMessage num <> " participants")}#{noneOneMoreEN n "" "" (" made " <> toMessage num)}#{noneOneMoreEN n "There were no submissions" " made one submission" " submissions"}.
 
 
 MenuLanguage: Language
diff --git a/src/Foundation.hs b/src/Foundation.hs
index b509bcd30..7d75f5a98 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -252,6 +252,27 @@ pluralEN num singularForm pluralForm
   | num == 1  = singularForm
   | otherwise = pluralForm
 
+noneOneMoreEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Singular
+            -> Text -- ^ Plural
+            -> Text
+noneOneMoreEN num noneText singularForm pluralForm
+  | num == 0  = noneText
+  | num == 1  = singularForm
+  | otherwise = pluralForm
+
+noneMoreEN :: (Eq a, Num a)
+            =>    a -- ^ Count
+            -> Text -- ^ None
+            -> Text -- ^ Some
+            -> Text
+noneMoreEN num noneText someText
+  | num == 0  = noneText
+  | otherwise = someText
+
+
 -- Convenience Type for Messages, since Yesod messages cannot deal with compound type identifiers
 type IntMaybe  = Maybe Int
 type TextList  = [Text]