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;