diff --git a/lib/message-handler.js b/lib/message-handler.js
index 088a37b2..5d3e9003 100644
--- a/lib/message-handler.js
+++ b/lib/message-handler.js
@@ -508,8 +508,8 @@ class MessageHandler {
                                             let updateAddressRegister = next => {
                                                 let addresses = [];
 
-                                                if (messageData.junk) {
-                                                    // skip junk messages
+                                                if (messageData.junk || flags.includes('\\Draft')) {
+                                                    // skip junk and draft messages
                                                     return next();
                                                 }
 
diff --git a/package.json b/package.json
index 821fdd36..83bb181a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "wildduck",
-    "version": "1.31.2",
+    "version": "1.31.3",
     "description": "IMAP/POP3 server built with Node.js and MongoDB",
     "main": "server.js",
     "scripts": {