From 7adc168471ceb02f76fd24060b6b7a620383b234 Mon Sep 17 00:00:00 2001
From: cketti <cketti@googlemail.com>
Date: Mon, 21 Jun 2010 18:17:10 +0000
Subject: [PATCH] Added a null pointer check to protect from
 NullPointerExceptions.

See issue 1749
---
 src/com/fsck/k9/activity/MessageList.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index b3ba97dbc..6c88a5085 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1926,7 +1926,16 @@ public class MessageList
         {
             for (MessageInfoHolder holder : mAdapter.messages)
             {
-                if (holder.message.equalsReference(messageReference))
+                /*
+                 * 2010-06-21 - cketti
+                 * Added null pointer check. Not sure what's causing 'holder'
+                 * to be null. See log provided in issue 1749, comment #15.
+                 * 
+                 * Please remove this comment once the cause was found and the
+                 * bug(?) fixed.
+                 */
+                if ((holder != null) && 
+                        holder.message.equalsReference(messageReference))
                 {
                     return holder;
                 }