diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 56b853d21..bf766ee4e 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -2622,8 +2622,9 @@ public class MessagingController implements Runnable {
             localFolder.open(OpenMode.READ_WRITE);
 
             Message message = localFolder.getMessage(uid);
-            setFlag(account, folderName, new Message[] { message }, flag, newState);
-
+            if (message != null) {
+                setFlag(account, folderName, new Message[] { message }, flag, newState);
+            }
         } catch (MessagingException me) {
             addErrorMessage(account, null, me);
             throw new RuntimeException(me);