diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 354a48e68..e2a3ff4dd 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1181,7 +1181,7 @@ public class EmailProvider extends ContentProvider {
      * any "orphan" database, so that both will be created together.  Note that an "orphan" database
      * will exist after either of the individual databases is deleted due to data corruption.
      */
-    public void checkDatabases() {
+    public synchronized void checkDatabases() {
         // Uncache the databases
         if (mDatabase != null) {
             mDatabase = null;