From 7bd162c9329944ba3c2902b4c10941622d17099e Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Tue, 6 Apr 2010 02:36:51 +0000
Subject: [PATCH] Merged from: 1552 | danapple0 | 2010-04-05 21:35:42 -0500
 (Mon, 05 Apr 2010) | 4 lines Changed paths:    M
 /k9mail/trunk/src/com/fsck/k9/MessagingController.java

Protect against a NullPointerException that happened once, but should
never have happened.
---
 src/com/fsck/k9/MessagingController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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)
         {