diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 16520cec70..4bd79046c1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -85,6 +85,10 @@ Fixed
 * Update ``st2 execution get`` command to always include ``context.user``, ``start_timestamp`` and
   ``end_timestamp`` attributes. (improvement) #4739
 
+* Fixed ``core.sendmail`` base64 encoding of longer subject lines (bug fix) #4795
+
+  Contributed by @stevemuskiewicz and @guzzijones
+
 3.1.0 - June 27, 2019
 ---------------------
 
diff --git a/contrib/core/actions/send_mail/send_mail b/contrib/core/actions/send_mail/send_mail
index 6011c43d49..465da4681c 100755
--- a/contrib/core/actions/send_mail/send_mail
+++ b/contrib/core/actions/send_mail/send_mail
@@ -65,7 +65,7 @@ if [[ -z $trimmed && $SEND_EMPTY_BODY -eq 1 ]] || [[ -n $trimmed ]]; then
 cat <<EOF
 TO: ${TO}
 FROM: ${FROM}
-SUBJECT: =?UTF-8?B?$(echo ${SUBJECT} | base64)?=
+SUBJECT: =?UTF-8?B?$(echo ${SUBJECT} | base64 -w 0)?=
 EOF
 
 if [[ -n $ATTACHMENTS ]]; then
diff --git a/contrib/core/pack.yaml b/contrib/core/pack.yaml
index 5f2779f1fb..1334da4b91 100644
--- a/contrib/core/pack.yaml
+++ b/contrib/core/pack.yaml
@@ -1,7 +1,7 @@
 ---
 name : core
 description : Basic core actions.
-version : 1.0.0
+version : 1.0.1
 python_versions:
   - "2"
   - "3"