diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index b845b3033b..e2c58fbac2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -429,16 +429,16 @@ public class ActivityEML extends ActivityBase {
 
                                                 ifolder.appendMessages(new Message[]{imessage});
                                             }
-
-                                            EntityOperation.sync(context, inbox.id, true);
-                                            ServiceSynchronize.eval(context, "EML");
                                         }
 
+                                        EntityOperation.sync(context, inbox.id, true);
+
                                         return account.name + "/" + inbox.name;
                                     }
 
                                     @Override
                                     protected void onExecuted(Bundle args, String name) {
+                                        ServiceSynchronize.eval(ActivityEML.this, "EML");
                                         ToastEx.makeText(ActivityEML.this, name, Toast.LENGTH_LONG).show();
                                     }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index d7c062bac3..2e51b0b1c5 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1093,8 +1093,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
 
             @Override
             protected void onExecuted(Bundle args, Void data) {
-                ToastEx.makeText(ActivitySetup.this, R.string.title_setup_imported, Toast.LENGTH_LONG).show();
                 ServiceSynchronize.eval(ActivitySetup.this, "import");
+                ToastEx.makeText(ActivitySetup.this, R.string.title_setup_imported, Toast.LENGTH_LONG).show();
             }
 
             @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 81153e1059..2a1699c0ca 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5493,6 +5493,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         }
 
                         ServiceSynchronize.eval(context, "move");
+
                         return null;
                     }