diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg
index 8fa5ea174..35350c9fb 100644
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@@ -326,7 +326,7 @@ MailSubjectSheetActive csh@CourseShorthand sheetName@SheetName: #{sheetName} in
MailSheetActiveIntro courseName@Text termDesc@Text sheetName@SheetName: Sie können nun #{sheetName} im Kurs #{courseName} (#{termDesc}) herunterladen.
MailSubjectSheetInactive csh@CourseShorthand sheetName@SheetName: #{sheetName} in #{csh} kann nur noch kurze Zeit abgegeben werden
-MailSheetInactiveIntro courseName@Text termDesc@Text sheetName@SheetName: Sie können #{sheetName} im Kurs #{courseName} (#{termDesc}) nur noch kurze Zeit abgeben.
+MailSheetInactiveIntro courseName@Text termDesc@Text sheetName@SheetName: Dia Abgabefirst für #{sheetName} im Kurs #{courseName} (#{termDesc}) endet in Kürze.
SheetTypeBonus: Bonus
SheetTypeNormal: Normal
diff --git a/src/Mail.hs b/src/Mail.hs
index 38d8ff5bb..a035cc6ad 100644
--- a/src/Mail.hs
+++ b/src/Mail.hs
@@ -303,7 +303,7 @@ instance YesodMail site => ToMailPart site (StateT Part (HandlerT site IO) a) wh
instance YesodMail site => ToMailPart site LT.Text where
toMailPart text = do
- _partType .= "text/plain"
+ _partType .= "text/plain; charset=utf-8"
_partEncoding .= QuotedPrintableText
_partContent .= encodeUtf8 text
@@ -315,7 +315,7 @@ instance YesodMail site => ToMailPart site LTB.Builder where
instance YesodMail site => ToMailPart site Html where
toMailPart html = do
- _partType .= "text/html"
+ _partType .= "text/html; charset=utf-8"
_partEncoding .= QuotedPrintableText
_partContent .= renderMarkup html
@@ -339,7 +339,7 @@ instance ToMailPart site a => ToMailPart site (Shakespeare.RenderUrl (Route site
instance YesodMail site => ToMailPart site Aeson.Value where
toMailPart val = do
- _partType .= "application/json"
+ _partType .= "application/json; charset=utf-8"
_partEncoding .= QuotedPrintableText
_partContent .= Aeson.encodePretty val
diff --git a/templates/mail/sheetActive.hamlet b/templates/mail/sheetActive.hamlet
index 384b2c516..aecc4c458 100644
--- a/templates/mail/sheetActive.hamlet
+++ b/templates/mail/sheetActive.hamlet
@@ -1,5 +1,8 @@
+$newline never
+\
+