diff --git a/templates/mail/sheetHint.hamlet b/templates/mail/sheetHint.hamlet
index 621f15227..a20ded146 100644
--- a/templates/mail/sheetHint.hamlet
+++ b/templates/mail/sheetHint.hamlet
@@ -11,11 +11,11 @@ $newline never
       }
   <body>
     <h1>
-      _{MsgMailSheetSolutionIntro (CI.original courseName) termDesc sheetName}
+      _{MsgMailSheetHintIntro (CI.original courseName) termDesc sheetName}
     <p>
       <a href=@{CSheetR tid ssh csh shn SShowR}>
         #{sheetName}
     <p>
-      <a href=@{CSheetR tid ssh csh shn (SZipR SheetSolution)}>
-        _{MsgSheetSolution}
+      <a href=@{CSheetR tid ssh csh shn (SZipR SheetHint)}>
+        _{MsgSheetHint}
     ^{editNotifications}
diff --git a/templates/mail/sheetSolution.hamlet b/templates/mail/sheetSolution.hamlet
index a20ded146..621f15227 100644
--- a/templates/mail/sheetSolution.hamlet
+++ b/templates/mail/sheetSolution.hamlet
@@ -11,11 +11,11 @@ $newline never
       }
   <body>
     <h1>
-      _{MsgMailSheetHintIntro (CI.original courseName) termDesc sheetName}
+      _{MsgMailSheetSolutionIntro (CI.original courseName) termDesc sheetName}
     <p>
       <a href=@{CSheetR tid ssh csh shn SShowR}>
         #{sheetName}
     <p>
-      <a href=@{CSheetR tid ssh csh shn (SZipR SheetHint)}>
-        _{MsgSheetHint}
+      <a href=@{CSheetR tid ssh csh shn (SZipR SheetSolution)}>
+        _{MsgSheetSolution}
     ^{editNotifications}
