diff --git a/src/de/jost_net/JVerein/io/MailSender.java b/src/de/jost_net/JVerein/io/MailSender.java
index ed4633a..1282dfa 100644
--- a/src/de/jost_net/JVerein/io/MailSender.java
+++ b/src/de/jost_net/JVerein/io/MailSender.java
@@ -52,6 +52,8 @@
 public class MailSender
 {
 
+  private static final String ISO_8859_15 = "ISO-8859-15";
+
   public static class IMAPCopyData
   {
     private final boolean copy_to_imap_folder;
@@ -203,8 +205,8 @@
     props.put("mail.smtp.host", smtp_host_name);
     props.put("mail.debug", "true");
     props.put("mail.smtp.port", smtp_port);
-    props.put("mail.mime.charset", "ISO-8859-15");
-    System.setProperty("mail.mime.charset", "ISO-8859-15");
+    props.put("mail.mime.charset", ISO_8859_15);
+    System.setProperty("mail.mime.charset", ISO_8859_15);
 
     if (smtp_ssl)
     {
@@ -268,10 +270,10 @@
     }
     msg.setSubject(subject);
 
-    BodyPart messageBodyPart = new MimeBodyPart();
-    messageBodyPart.addHeader("Content-Encoding", "ISO-8859-15");
+    MimeBodyPart messageBodyPart = new MimeBodyPart();
+    messageBodyPart.addHeader("Content-Encoding", ISO_8859_15);
     // Fill the message
-    messageBodyPart.setContent(text, "text/plain");
+    messageBodyPart.setText(text, ISO_8859_15);
 
     Multipart multipart = new MimeMultipart();
     multipart.addBodyPart(messageBodyPart);