diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index e8b71d27c1..65e0eda6fa 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -903,7 +903,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(ActivityView.this);
                 lbm.sendBroadcast(
                         new Intent(ActivityView.ACTION_VIEW_MESSAGES)
-                                .putExtra("account", -1)
+                                .putExtra("account", -1L)
                                 .putExtra("folder", folder));
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index e958d41a62..786e8fbb2d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -106,7 +106,7 @@ public class FragmentAccounts extends FragmentBase {
             public void onClick(View v) {
                 startActivity(new Intent(getContext(), ActivityCompose.class)
                         .putExtra("action", "new")
-                        .putExtra("account", -1)
+                        .putExtra("account", -1L)
                 );
             }
         });