diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b840c1860a..44cff0f62d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3711,12 +3711,35 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     Helper.hasPermission(context, Manifest.permission.WRITE_CALENDAR)) {
                 Bundle args = new Bundle();
                 args.putLong("message", message.id);
+                args.putLong("account", message.account);
                 args.putInt("status", CalendarContract.Events.STATUS_TENTATIVE);
 
-                FragmentDialogCalendar fragment = new FragmentDialogCalendar();
-                fragment.setArguments(args);
-                fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_CALENDAR);
-                fragment.show(parentFragment.getParentFragmentManager(), "insert:calendar");
+                new SimpleTask<String>() {
+                    @Override
+                    protected String onExecute(Context context, Bundle args) throws Throwable {
+                        long aid = args.getLong("account");
+
+                        DB db = DB.getInstance(context);
+                        EntityAccount account = db.account().getAccount(aid);
+                        return (account == null ? null : account.calendar);
+                    }
+
+                    @Override
+                    protected void onExecuted(Bundle args, String calendar) {
+                        args.putString("calendar", calendar);
+
+                        FragmentDialogCalendar fragment = new FragmentDialogCalendar();
+                        fragment.setArguments(args);
+                        fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_CALENDAR);
+                        fragment.show(parentFragment.getParentFragmentManager(), "insert:calendar");
+                    }
+
+                    @Override
+                    protected void onException(Bundle args, Throwable ex) {
+                        Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
+                    }
+                }.execute(context, owner, args, "insert:calendar");
+
                 return;
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java b/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
index 1a18d6e9ec..c0075e1ffa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
@@ -137,7 +137,6 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
         return builder.create();
     }
 
-
     private class Calendar {
         private long id;
         private String account;