From 00d30f1b8ad9057aa00cff8a85536b4e4b722e5c Mon Sep 17 00:00:00 2001
From: Marcus Wolschon <Marcus.Wolschon@googlemail.com>
Date: Wed, 18 Aug 2010 14:27:39 +0000
Subject: [PATCH] NullPointerException and TODO-Marker on a strange code-line

---
 src/com/fsck/k9/provider/MessageProvider.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/src/com/fsck/k9/provider/MessageProvider.java
index 41456e973..2f6e54ddd 100644
--- a/src/com/fsck/k9/provider/MessageProvider.java
+++ b/src/com/fsck/k9/provider/MessageProvider.java
@@ -202,7 +202,9 @@ public class MessageProvider extends ContentProvider
 
     public void setApplication(Application app)
     {
-
+    	if (context == null) {
+    		context = app.getApplicationContext();
+    	}
         if (app != null)
         {
             mApp = app;