diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index f9b0615a38..3efe9af922 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -356,7 +356,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         db.message().liveUnseenNotify().observe(this, new Observer<List<TupleMessageEx>>() {
             @Override
             public void onChanged(List<TupleMessageEx> messages) {
-                Core.notify(ActivityView.this, messages);
+                Core.notifyMessages(ActivityView.this, messages);
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index fc5756bdbc..51b1a9fe0f 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -185,7 +185,7 @@ class Core {
                                 break;
 
                             case EntityOperation.SYNC:
-                                onSynchronizeMessages(context, account, folder, (IMAPFolder) ifolder, jargs, state);
+                                onSynchronizeMessages(context, jargs, account, folder, (IMAPFolder) ifolder, state);
                                 break;
 
                             default:
@@ -792,7 +792,10 @@ class Core {
         }
     }
 
-    static void onSynchronizeMessages(Context context, EntityAccount account, final EntityFolder folder, IMAPFolder ifolder, JSONArray jargs, State state) throws JSONException, MessagingException, IOException {
+    static void onSynchronizeMessages(
+            Context context, JSONArray jargs,
+            EntityAccount account, final EntityFolder folder,
+            IMAPFolder ifolder, State state) throws JSONException, MessagingException, IOException {
         final DB db = DB.getInstance(context);
         try {
             int sync_days = jargs.getInt(0);
@@ -1389,7 +1392,7 @@ class Core {
         }
     }
 
-    static void notify(Context context, List<TupleMessageEx> messages) {
+    static void notifyMessages(Context context, List<TupleMessageEx> messages) {
         Log.i("Notify messages=" + messages.size());
 
         Widget.update(context, messages.size());
@@ -1476,7 +1479,10 @@ class Core {
         }
     }
 
-    private static List<Notification> getNotificationUnseen(Context context, long account, String accountName, List<TupleMessageEx> messages) {
+    private static List<Notification> getNotificationUnseen(
+            Context context,
+            long account, String accountName,
+            List<TupleMessageEx> messages) {
         List<Notification> notifications = new ArrayList<>();
 
         if (messages.size() == 0)
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 43d437e00d..51bafa86b9 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -127,7 +127,7 @@ public class ServiceSynchronize extends LifecycleService {
         db.message().liveUnseenNotify().observe(this, new Observer<List<TupleMessageEx>>() {
             @Override
             public void onChanged(List<TupleMessageEx> messages) {
-                Core.notify(ServiceSynchronize.this, messages);
+                Core.notifyMessages(ServiceSynchronize.this, messages);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index e8e758f564..ec60753175 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -279,7 +279,7 @@ public class ServiceUI extends IntentService {
             Core.processOperations(this, account, folder, isession, istore, ifolder, new Core.State());
 
             // Synchronize messages
-            Core.onSynchronizeMessages(this, account, folder, (IMAPFolder) ifolder, folder.getSyncArgs(), new Core.State());
+            Core.onSynchronizeMessages(this, folder.getSyncArgs(), account, folder, (IMAPFolder) ifolder, new Core.State());
 
         } catch (Throwable ex) {
             Log.w(ex);