diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 28c972fd5..0a92f833b 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -29,11 +29,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz",
       "dev": true
     },
-    "addressparser": {
-      "version": "0.3.2",
-      "from": "addressparser@>=0.3.2 <0.4.0",
-      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"
-    },
     "ajv": {
       "version": "4.11.7",
       "from": "ajv@>=4.9.1 <5.0.0",
@@ -331,18 +326,6 @@
       "from": "buffer-shims@>=1.0.0 <1.1.0",
       "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
     },
-    "buildmail": {
-      "version": "2.0.0",
-      "from": "buildmail@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz",
-      "dependencies": {
-        "needle": {
-          "version": "0.10.0",
-          "from": "needle@>=0.10.0 <0.11.0",
-          "resolved": "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"
-        }
-      }
-    },
     "builtin-modules": {
       "version": "1.1.1",
       "from": "builtin-modules@^1.0.0",
@@ -1963,6 +1946,23 @@
       "from": "http-signature@>=1.1.0 <1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
     },
+    "httpntlm": {
+      "version": "1.6.1",
+      "from": "httpntlm@1.6.1",
+      "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
+      "dependencies": {
+        "underscore": {
+          "version": "1.7.0",
+          "from": "underscore@>=1.7.0 <1.8.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+        }
+      }
+    },
+    "httpreq": {
+      "version": "0.4.23",
+      "from": "httpreq@>=0.4.22",
+      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.23.tgz"
+    },
     "i": {
       "version": "0.3.5",
       "from": "i@>=0.3.0 <0.4.0",
@@ -2407,21 +2407,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "dev": true
     },
-    "libbase64": {
-      "version": "0.1.0",
-      "from": "libbase64@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"
-    },
-    "libmime": {
-      "version": "1.2.0",
-      "from": "libmime@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"
-    },
-    "libqp": {
-      "version": "1.1.0",
-      "from": "libqp@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"
-    },
     "liftoff": {
       "version": "2.3.0",
       "from": "liftoff@>=2.1.0 <3.0.0",
@@ -2626,11 +2611,6 @@
       "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
       "dev": true
     },
-    "mailcomposer": {
-      "version": "2.1.0",
-      "from": "mailcomposer@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz"
-    },
     "map-cache": {
       "version": "0.2.2",
       "from": "map-cache@>=0.2.0 <0.3.0",
@@ -2860,11 +2840,6 @@
       "from": "ncp@>=1.0.0 <1.1.0",
       "resolved": "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"
     },
-    "needle": {
-      "version": "0.11.0",
-      "from": "needle@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"
-    },
     "negotiator": {
       "version": "0.6.1",
       "from": "negotiator@0.6.1",
@@ -2933,23 +2908,28 @@
       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"
     },
     "nodemailer": {
-      "version": "1.11.0",
-      "from": "nodemailer@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"
+      "version": "4.0.1",
+      "from": "nodemailer@latest",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.0.1.tgz"
     },
-    "nodemailer-direct-transport": {
+    "nodemailer-fetch": {
+      "version": "1.6.0",
+      "from": "nodemailer-fetch@1.6.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"
+    },
+    "nodemailer-shared": {
       "version": "1.1.0",
-      "from": "nodemailer-direct-transport@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"
+      "from": "nodemailer-shared@1.1.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"
     },
     "nodemailer-smtp-transport": {
-      "version": "1.1.0",
-      "from": "nodemailer-smtp-transport@>=1.0.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"
+      "version": "2.7.4",
+      "from": "nodemailer-smtp-transport@latest",
+      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.4.tgz"
     },
     "nodemailer-wellknown": {
       "version": "0.1.10",
-      "from": "nodemailer-wellknown@>=0.1.7 <0.2.0",
+      "from": "nodemailer-wellknown@0.1.10",
       "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"
     },
     "nopt": {
@@ -4200,9 +4180,9 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
     },
     "smtp-connection": {
-      "version": "1.3.8",
-      "from": "smtp-connection@>=1.3.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"
+      "version": "2.12.0",
+      "from": "smtp-connection@2.12.0",
+      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"
     },
     "sntp": {
       "version": "1.0.9",
diff --git a/package.json b/package.json
index 4977e457c..c7d7e21fd 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,8 @@
     "multiparty": "^4.1.2",
     "mysql": "^2.7.0",
     "node-uuid": "^1.4.3",
-    "nodemailer": "^1.3.0",
-    "nodemailer-smtp-transport": "^1.0.3",
+    "nodemailer": "^4.0.1",
+    "nodemailer-smtp-transport": "^2.7.4",
     "oauth2orize": "^1.0.1",
     "once": "^1.3.2",
     "parse-links": "^0.1.0",