diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg
index 4a0156841..6f54a2e5e 100644
--- a/messages/uniworx/de-de-formal.msg
+++ b/messages/uniworx/de-de-formal.msg
@@ -1017,10 +1017,10 @@ MailCourseRegisteredIntroOther displayName@Text courseName@Text termDesc@Text: #
 MailSubjectExamResult csh@CourseShorthand examn@ExamName: Ergebnisse für #{examn} in #{csh} wurden herausgegeben
 MailExamResultIntro courseName@Text termDesc@Text examn@ExamName: Sie können nun Ihr Ergebnis für #{examn} im Kurs #{courseName} (#{termDesc}) einsehen.
 
-MailSubjectExamOfficeExamResults csh@CourseShorthand examn@ExamName: Ergebnisse für #{examn} in #{csh} sind fertiggestellt
+MailSubjectExamOfficeExamResults coursen@CourseName examn@ExamName: Ergebnisse für #{examn} in #{coursen} sind fertiggestellt
 MailExamOfficeExamResultsIntro courseName@Text termDesc@Text examn@ExamName: Ein Kursverwalter hat die Prüfungsleistungen für #{examn} im Kurs #{courseName} (#{termDesc}) freigegeben.
 
-MailSubjectExamOfficeExamResultsChanged csh@CourseShorthand examn@ExamName: Ergebnisse für #{examn} in #{csh} wurden verändert
+MailSubjectExamOfficeExamResultsChanged coursen@CourseName examn@ExamName: Ergebnisse für #{examn} in #{coursen} wurden verändert
 MailExamOfficeExamResultsChangedIntro courseName@Text termDesc@Text examn@ExamName: Ein Kursverwalter hat Prüfungsleistungen für #{examn} im Kurs #{courseName} (#{termDesc}) verändert.
 
 MailSubjectExamOfficeExternalExamResults coursen@CourseName examn@ExamName: Ergebnisse für #{examn} in #{coursen}
diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg
index 17e8672ed..75b828737 100644
--- a/messages/uniworx/en-eu.msg
+++ b/messages/uniworx/en-eu.msg
@@ -1017,10 +1017,10 @@ MailCourseRegisteredIntroOther displayName courseName termDesc: #{displayName} w
 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 #{csh} are now available
+MailSubjectExamOfficeExamResults coursen examn: Results for #{examn} of #{coursen} 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
+MailSubjectExamOfficeExamResultsChanged coursen examn: Results for #{examn} of #{coursen} were changed
 MailExamOfficeExamResultsChangedIntro courseName termDesc examn: A course administrator has changed exam results for #{examn} of the course #{courseName} (#{termDesc}).
 
 MailSubjectExamOfficeExternalExamResults coursen@CourseName examn@ExamName: Results for #{examn} in #{coursen}
diff --git a/src/Jobs/Handler/SendNotification/ExamOffice.hs b/src/Jobs/Handler/SendNotification/ExamOffice.hs
index c7a6d1c37..62992478a 100644
--- a/src/Jobs/Handler/SendNotification/ExamOffice.hs
+++ b/src/Jobs/Handler/SendNotification/ExamOffice.hs
@@ -24,7 +24,7 @@ dispatchNotificationExamOfficeExamResults nExam jRecipient = userMailT jRecipien
     course <- belongsToJust examCourse exam
     return (course, exam)
   replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
-  setSubjectI $ MsgMailSubjectExamOfficeExamResults courseShorthand examName
+  setSubjectI $ MsgMailSubjectExamOfficeExamResults courseName examName
 
   MsgRenderer mr <- getMailMsgRenderer
   let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm
@@ -48,7 +48,7 @@ dispatchNotificationExamOfficeExamResultsChanged nExamResults jRecipient = do
       course <- belongsToJust examCourse exam
       return (course, exam)
     replaceMailHeader "Auto-Submitted" $ Just "auto-generated"
-    setSubjectI $ MsgMailSubjectExamOfficeExamResultsChanged courseShorthand examName
+    setSubjectI $ MsgMailSubjectExamOfficeExamResultsChanged courseName examName
 
     MsgRenderer mr <- getMailMsgRenderer
     let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm