diff --git a/common/source/java/ch/systemsx/cisd/common/mail/MailClient.java b/common/source/java/ch/systemsx/cisd/common/mail/MailClient.java
index bc26fa9fa161893f59a100412a389bc5e41254bc..5c7aa264cc016cadfee542e13061b52c2ca36052 100644
--- a/common/source/java/ch/systemsx/cisd/common/mail/MailClient.java
+++ b/common/source/java/ch/systemsx/cisd/common/mail/MailClient.java
@@ -60,6 +60,8 @@ public final class MailClient extends Authenticator implements IMailClient
     /** This system property is not supported by the <i>JavaMail API</i> */
     public final static String MAIL_SMTP_PASSWORD = "mail.smtp.password";
 
+    private static final String UNICODE_CHARSET = "utf-8";
+
     private static final Logger operationLog =
             LogFactory.getLogger(LogCategory.OPERATION, MailClient.class);
 
@@ -183,8 +185,15 @@ public final class MailClient extends Authenticator implements IMailClient
                 msg.setReplyTo(replyToAddress);
             }
             msg.addRecipients(Message.RecipientType.TO, internetAddresses);
-            msg.setSubject(subject);
-            msg.setText(content);
+            if (true)
+            {
+                msg.setSubject(subject);
+                msg.setText(content);
+            } else
+            {
+                msg.setSubject(subject, UNICODE_CHARSET);
+                msg.setText(content, UNICODE_CHARSET);
+            }
             send(msg);
         } catch (MessagingException ex)
         {