diff --git a/History.md b/History.md
index 6173293724..582859d858 100644
--- a/History.md
+++ b/History.md
@@ -12,7 +12,7 @@
 
 * Released `dev-error-overlay@0.1.1` fixing sometimes page content being on top of error overlay
 
-* Released `email@2.1.0` with updated `nodemailer@6.6.0`
+* Released `email@2.1.0` with updated `nodemailer@6.6.0`, it now adds `charset=utf-8` to `text/plain` messages
 
 ## v2.2, 2021-04-15
 
diff --git a/packages/email/.npm/package/npm-shrinkwrap.json b/packages/email/.npm/package/npm-shrinkwrap.json
index e4ffb8f728..cdbc53f991 100644
--- a/packages/email/.npm/package/npm-shrinkwrap.json
+++ b/packages/email/.npm/package/npm-shrinkwrap.json
@@ -2,9 +2,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "nodemailer": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.6.tgz",
-      "integrity": "sha512-/kJ+FYVEm2HuUlw87hjSqTss+GU35D4giOpdSfGp7DO+5h6RlJj7R94YaYHOkoxu1CSaM0d3WRBtCzwXrY6MKA=="
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.0.tgz",
+      "integrity": "sha512-ikSMDU1nZqpo2WUPE0wTTw/NGGImTkwpJKDIFPZT+YvvR9Sj+ze5wzu95JHkBMglQLoG2ITxU21WukCC/XsFkg=="
     },
     "stream-buffers": {
       "version": "3.0.2",
diff --git a/packages/email/email_tests.js b/packages/email/email_tests.js
index 97c0977660..62284aa603 100644
--- a/packages/email/email_tests.js
+++ b/packages/email/email_tests.js
@@ -42,7 +42,7 @@ Tinytest.add("email - fully customizable", function (test) {
     test.equal(canonicalize(stream.getContentsAsString("utf8")),
                "====== BEGIN MAIL #0 ======\n" +
                devWarningBanner +
-               "Content-Type: text/plain\r\n" +
+               "Content-Type: text/plain; charset=utf-8\r\n" +
                "X-Meteor-Test: a custom header\r\n" +
                "Date: dummy\r\n" +
                "From: foo@example.com\r\n" +
@@ -116,7 +116,7 @@ Tinytest.add("email - using mail composer", function (test) {
     test.equal(canonicalize(stream.getContentsAsString("utf8")),
                "====== BEGIN MAIL #0 ======\n" +
                devWarningBanner +
-               "Content-Type: text/plain\r\n" +
+               "Content-Type: text/plain; charset=utf-8\r\n" +
                "From: a@b.com\r\n" +
                "Message-ID: <...>\r\n" +
                "Content-Transfer-Encoding: 7bit\r\n" +
@@ -160,7 +160,7 @@ Tinytest.add("email - long lines", function (test) {
     test.equal(canonicalize(stream.getContentsAsString("utf8")),
                "====== BEGIN MAIL #0 ======\n" +
                devWarningBanner +
-               "Content-Type: text/plain\r\n" +
+               "Content-Type: text/plain; charset=utf-8\r\n" +
                "From: foo@example.com\r\n" +
                "To: bar@example.com\r\n" +
                "Subject: This is a very very very very very very very very " +
@@ -225,12 +225,12 @@ Tinytest.add("email - text and html", function (test) {
                "MIME-Version: 1.0\r\n" +
                "\r\n" +
                "----...-Part_1\r\n" +
-               "Content-Type: text/plain\r\n" +
+               "Content-Type: text/plain; charset=utf-8\r\n" +
                "Content-Transfer-Encoding: 7bit\r\n" +
                "\r\n" +
                "*Cool*, man\r\n" +
                "----...-Part_1\r\n" +
-               "Content-Type: text/html\r\n" +
+               "Content-Type: text/html; charset=utf-8\r\n" +
                "Content-Transfer-Encoding: 7bit\r\n" +
                "\r\n" +
                "<i>Cool</i>, man\r\n" +