From 0e951161540e617992c18ffc99c93e993c607642 Mon Sep 17 00:00:00 2001
From: Johan Dahlberg <johan.dahlberg@medsci.uu.se>
Date: Tue, 5 Feb 2019 13:45:21 +0100
Subject: [PATCH 1/2] UTF-8 encode both body and subject of email

---
 contrib/core/actions/send_mail/send_mail | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/core/actions/send_mail/send_mail b/contrib/core/actions/send_mail/send_mail
index 1d9bdbdc14..c75478c6bc 100755
--- a/contrib/core/actions/send_mail/send_mail
+++ b/contrib/core/actions/send_mail/send_mail
@@ -52,7 +52,7 @@ if [[ -z $trimmed && $SEND_EMPTY_BODY -eq 1 ]] || [[ -n $trimmed ]]; then
 cat <<EOF
 TO: ${TO}
 FROM: ${FROM}
-SUBJECT: ${SUBJECT}
+SUBJECT: =?UTF-8?q?${SUBJECT}?=
 EOF
 
 if [[ -n $ATTACHMENTS ]]; then
@@ -83,7 +83,7 @@ EOF
 
   cat <<EOF
 --${boundary}
-Content-Type: ${CONTENT_TYPE}
+Content-Type: ${CONTENT_TYPE}; charset=UTF-8
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
@@ -92,7 +92,7 @@ EOF
 else
 
   cat <<EOF
-Content-Type: ${CONTENT_TYPE}
+Content-Type: ${CONTENT_TYPE}; charset=UTF-8
 
 EOF
 

From 9e9c0cef0f896ded0fdadb334df7ebe37d61009f Mon Sep 17 00:00:00 2001
From: Johan Dahlberg <johan.dahlberg@medsci.uu.se>
Date: Tue, 5 Feb 2019 14:56:13 +0100
Subject: [PATCH 2/2] base64 encode subject

---
 contrib/core/actions/send_mail/send_mail | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/core/actions/send_mail/send_mail b/contrib/core/actions/send_mail/send_mail
index c75478c6bc..c7e756b777 100755
--- a/contrib/core/actions/send_mail/send_mail
+++ b/contrib/core/actions/send_mail/send_mail
@@ -52,7 +52,7 @@ if [[ -z $trimmed && $SEND_EMPTY_BODY -eq 1 ]] || [[ -n $trimmed ]]; then
 cat <<EOF
 TO: ${TO}
 FROM: ${FROM}
-SUBJECT: =?UTF-8?q?${SUBJECT}?=
+SUBJECT: =?UTF-8?B?$(echo ${SUBJECT} | base64)?=
 EOF
 
 if [[ -n $ATTACHMENTS ]]; then