From 8660ed91eb8e5c45a4077ffdb11710a4bda8a402 Mon Sep 17 00:00:00 2001 From: "Ariel D. Moya Sequeira" Date: Fri, 8 Jan 2016 10:06:20 -0600 Subject: [PATCH] Adds UTF-8 charset to emails --- .../vitro/webapp/email/FreemarkerEmailMessage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java index 710242dd9..b770be6c8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java @@ -172,15 +172,15 @@ public class FreemarkerEmailMessage { if (htmlContent.isEmpty()) { log.error("Message has neither text body nor HTML body"); } else { - msg.setContent(htmlContent, "text/html"); + msg.setContent(htmlContent, "text/html; charset=UTF-8"); } } else { if (htmlContent.isEmpty()) { - msg.setContent(textContent, "text/plain"); + msg.setContent(textContent, "text/plain; charset=UTF-8"); } else { MimeMultipart content = new MimeMultipart("alternative"); - addBodyPart(content, textContent, "text/plain"); - addBodyPart(content, htmlContent, "text/html"); + addBodyPart(content, textContent, "text/plain; charset=UTF-8"); + addBodyPart(content, htmlContent, "text/html; charset=UTF-8"); msg.setContent(content); } }