diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
index 66441226c..300a59ded 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
@@ -230,7 +230,9 @@ public class ApplicationLoader extends Application {
         // open() should be called before MessagesController.getInstance() as this also initilizes directories based upon getBlobdir().
         File dbfile = new File(getFilesDirFixed(), "messenger.db");
         MrMailbox.open(dbfile.getAbsolutePath());
-        MrMailbox.connect();
+        if( MrMailbox.isConfigured()!=0 ) {
+            MrMailbox.connect();
+        }
 
         // create other default objects
         SharedPreferences mainPreferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);