diff --git a/package-lock.json b/package-lock.json
index 357e5ae..bf97463 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,11 +63,6 @@
         }
       }
     },
-    "addressparser": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz",
-      "integrity": "sha1-WYc/Nej89sc2HBAjkmHXbhU0i7I="
-    },
     "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -651,6 +646,7 @@
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
       "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
+      "optional": true,
       "requires": {
         "hoek": "0.9.1"
       }
@@ -721,29 +717,6 @@
       "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
       "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
     },
-    "buildmail": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz",
-      "integrity": "sha1-8LewpZ6aShtQZrv6BR0kjzgy7s4=",
-      "requires": {
-        "addressparser": "0.3.2",
-        "libbase64": "0.1.0",
-        "libmime": "1.2.0",
-        "libqp": "1.1.0",
-        "needle": "0.10.0"
-      },
-      "dependencies": {
-        "needle": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz",
-          "integrity": "sha1-FqJNY/KmEVLrdMzh0Sr4XFB1d9Q=",
-          "requires": {
-            "debug": "2.6.9",
-            "iconv-lite": "0.4.24"
-          }
-        }
-      }
-    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -2131,7 +2104,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2149,11 +2123,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
@@ -2166,15 +2142,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2277,7 +2256,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2287,6 +2267,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -2299,17 +2280,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "1.1.11"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "5.1.2",
             "yallist": "3.0.3"
@@ -2326,6 +2310,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2398,7 +2383,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2408,6 +2394,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1.0.2"
           }
@@ -2483,7 +2470,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2513,6 +2501,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -2530,6 +2519,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
@@ -2568,11 +2558,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -2781,7 +2773,8 @@
     "hoek": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
-      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU="
+      "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
+      "optional": true
     },
     "home-or-tmp": {
       "version": "1.0.0",
@@ -3444,26 +3437,6 @@
         "type-check": "0.3.2"
       }
     },
-    "libbase64": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
-    },
-    "libmime": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz",
-      "integrity": "sha1-jYS087Ils3BEECNu9JSQZDa6dCs=",
-      "requires": {
-        "iconv-lite": "0.4.24",
-        "libbase64": "0.1.0",
-        "libqp": "1.1.0"
-      }
-    },
-    "libqp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
-    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -3538,15 +3511,6 @@
         "yallist": "2.1.2"
       }
     },
-    "mailcomposer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz",
-      "integrity": "sha1-plMYIomWFP7omckiJtgeK5y7GD0=",
-      "requires": {
-        "buildmail": "2.0.0",
-        "libmime": "1.2.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -3912,15 +3876,6 @@
         }
       }
     },
-    "needle": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz",
-      "integrity": "sha1-AqcbAI6vfVWuifuf12hbe4jXvCk=",
-      "requires": {
-        "debug": "2.6.9",
-        "iconv-lite": "0.4.24"
-      }
-    },
     "negotiator": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz",
@@ -4027,24 +3982,9 @@
       "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
     },
     "nodemailer": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz",
-      "integrity": "sha1-TmnLObAwFbHR7wx4qBVBK56Xb3k=",
-      "requires": {
-        "libmime": "1.2.0",
-        "mailcomposer": "2.1.0",
-        "needle": "0.11.0",
-        "nodemailer-direct-transport": "1.1.0",
-        "nodemailer-smtp-transport": "1.1.0"
-      }
-    },
-    "nodemailer-direct-transport": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz",
-      "integrity": "sha1-oveHCO5vFuoFc/yClJ0Tj/Fy9iQ=",
-      "requires": {
-        "smtp-connection": "1.3.8"
-      }
+      "version": "6.4.16",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz",
+      "integrity": "sha512-68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ=="
     },
     "nodemailer-ses-transport": {
       "version": "1.5.1",
@@ -4054,21 +3994,6 @@
         "aws-sdk": "2.494.0"
       }
     },
-    "nodemailer-smtp-transport": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz",
-      "integrity": "sha1-5sN/MYhaswgOfe089SjErX5pE5g=",
-      "requires": {
-        "clone": "1.0.4",
-        "nodemailer-wellknown": "0.1.10",
-        "smtp-connection": "1.3.8"
-      }
-    },
-    "nodemailer-wellknown": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
-      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U="
-    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -5692,11 +5617,6 @@
       "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
       "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
     },
-    "smtp-connection": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz",
-      "integrity": "sha1-VYMsIWDPswhuHc2H/RwZ+mG39TY="
-    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
diff --git a/package.json b/package.json
index b9fdfaf..8a45cfc 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "jsx-loader": "^0.13.2",
     "mofo-style": "^2.3.0",
     "mongoose": "^4.1.4",
-    "nodemailer": "^1.4.0",
+    "nodemailer": "^6.4.16",
     "nodemailer-ses-transport": "^1.3.0",
     "npm-run-all": "^1.2.4",
     "react": "^0.13.2",