diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 32ef300c8c..58bf5d6b5c 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -83,7 +83,9 @@ public interface DaoFolder {
 
     @Query("SELECT folder.* FROM folder" +
             " JOIN account ON account.id = folder.account" +
-            " WHERE `primary` AND type = '" + EntityFolder.DRAFTS + "'")
+            " WHERE account.synchronize" +
+            " AND account.`primary`" +
+            " AND folder.type = '" + EntityFolder.DRAFTS + "'")
     LiveData<EntityFolder> livePrimaryDrafts();
 
     @Query("SELECT folder.*" +
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 5d533bcb7b..f689bcd572 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -48,7 +48,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 
 public class FragmentSetup extends FragmentBase {
@@ -272,7 +271,6 @@ public class FragmentSetup extends FragmentBase {
 
         db.account().liveSynchronizingAccounts().observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {
             private boolean done = false;
-            private LiveData<EntityFolder> livePrimaryDrafts = null;
 
             @Override
             public void onChanged(@Nullable List<EntityAccount> accounts) {
@@ -286,18 +284,13 @@ public class FragmentSetup extends FragmentBase {
 
                 btnIdentity.setEnabled(done);
                 btnInbox.setEnabled(done);
+            }
+        });
 
-                if (livePrimaryDrafts == null)
-                    livePrimaryDrafts = db.folder().livePrimaryDrafts();
-                else
-                    livePrimaryDrafts.removeObservers(getViewLifecycleOwner());
-
-                livePrimaryDrafts.observe(getViewLifecycleOwner(), new Observer<EntityFolder>() {
-                    @Override
-                    public void onChanged(EntityFolder drafts) {
-                        tvNoPrimaryDrafts.setVisibility(done && drafts == null ? View.VISIBLE : View.GONE);
-                    }
-                });
+        db.folder().livePrimaryDrafts().observe(getViewLifecycleOwner(), new Observer<EntityFolder>() {
+            @Override
+            public void onChanged(EntityFolder draft) {
+                tvNoPrimaryDrafts.setVisibility(draft == null ? View.VISIBLE : View.GONE);
             }
         });