diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java
index 1858958c0..f24c3ffd1 100644
--- a/src/com/fsck/k9/MessagingController.java
+++ b/src/com/fsck/k9/MessagingController.java
@@ -3551,7 +3551,10 @@ public class MessagingController implements Runnable
             localFolder = localStore.getFolder(account.getDraftsFolderName());
             localFolder.open(OpenMode.READ_WRITE);
             Message message = localFolder.getMessage(uid);
-            deleteMessages(new Message[] { message }, null);
+            if (message != null)
+            {
+                deleteMessages(new Message[] { message }, null);
+            }
         }
         catch (MessagingException me)
         {