diff --git a/lib/Connection.js b/lib/Connection.js
index bd31e98b..0e07c7cd 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -4,7 +4,7 @@ var tls = require('tls'),
     inherits = require('util').inherits,
     inspect = require('util').inspect,
     isDate = require('util').isDate,
-    utf7 = require('utf7').imap;
+    utf7 = require('safe-utf7').imap;
 
 var Parser = require('./Parser').Parser,
     parseExpr = require('./Parser').parseExpr,
diff --git a/lib/Parser.js b/lib/Parser.js
index 1dd386ba..2b369d2a 100644
--- a/lib/Parser.js
+++ b/lib/Parser.js
@@ -4,7 +4,7 @@ var EventEmitter = require('events').EventEmitter,
     inherits = require('util').inherits,
     inspect = require('util').inspect;
 
-var utf7 = require('utf7').imap,
+var utf7 = require('safe-utf7').imap,
     jsencoding; // lazy-loaded
 
 var CH_LF = 10,
diff --git a/package.json b/package.json
index 96633a11..79266b9a 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 { "name": "imap",
-  "version": "0.8.19",
+  "version": "0.8.20",
   "author": "Brian White <mscdex@mscdex.net>",
   "description": "An IMAP module for node.js that makes communicating with IMAP servers easy",
   "main": "./lib/Connection",
   "dependencies": {
-    "utf7": ">=1.0.2"
+    "safe-utf7": ">=1.0.6"
   },
   "scripts": {
     "test": "node test/test.js"