From a1caebdcf10b63841d2bc86f5721451dc409c7c4 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 26 Mar 2012 19:41:21 +0200
Subject: [PATCH] Fixed potential NullPointerException

---
 src/com/fsck/k9/controller/MessagingController.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index bf7a3233b..090db17ac 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -2265,10 +2265,12 @@ public class MessagingController implements Runnable {
                     String newUid = remoteUidMap.get(remoteSrcUid);
 
                     Message localDestMessage = localDestFolder.getMessage(localDestUid);
-                    localDestMessage.setUid(newUid);
-                    localDestFolder.changeUid((LocalMessage)localDestMessage);
-                    for (MessagingListener l : getListeners()) {
-                        l.messageUidChanged(account, destFolder, localDestUid, newUid);
+                    if (localDestMessage != null) {
+                        localDestMessage.setUid(newUid);
+                        localDestFolder.changeUid((LocalMessage)localDestMessage);
+                        for (MessagingListener l : getListeners()) {
+                            l.messageUidChanged(account, destFolder, localDestUid, newUid);
+                        }
                     }
                 }
             }