From 593569f4ad4dc2308bdc6eecee83dc6297090861 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Wed, 12 Sep 2012 18:54:06 -0400
Subject: [PATCH] Bullet-proof an NPE I ran into on a 2.2 test emulator while
 on an airplane

---
 src/com/fsck/k9/activity/MessageList.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 1cc0377de..d07dfccda 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1990,7 +1990,7 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
             Folder folder;
             for (MessageInfoHolder holder : mMessages) {
                 uid = message.getUid();
-                if (holder.uid == uid || uid.equals(holder.uid)) {
+                if (uid != null && (holder.uid == uid || uid.equals(holder.uid))) {
                     folder = message.getFolder();
                      if (holder.folder.name.equals(folder.getName()) &&
                              holder.account.equals(folder.getAccount().getUuid())) {