diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 44cff0f62d..ca0b15f50a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3727,6 +3727,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     @Override
                     protected void onExecuted(Bundle args, String calendar) {
                         args.putString("calendar", calendar);
+                        args.putBoolean("forevent", true);
 
                         FragmentDialogCalendar fragment = new FragmentDialogCalendar();
                         fragment.setArguments(args);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java b/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
index c0075e1ffa..338999f859 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogCalendar.java
@@ -47,7 +47,10 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
         final Context context = getContext();
         final ContentResolver resolver = context.getContentResolver();
 
-        String selectedCalendar = getArguments().getString("calendar");
+        Bundle args = getArguments();
+        boolean forevent = args.getBoolean("forevent");
+
+        String selectedCalendar = args.getString("calendar");
         String selectedAccount;
         String selectedName;
         try {
@@ -122,15 +125,16 @@ public class FragmentDialogCalendar extends FragmentDialogBase {
             }
         });
 
-        builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                getArguments().putLong("id", -1);
-                getArguments().putString("account", null);
-                getArguments().putString("type", null);
-                sendResult(RESULT_OK);
-            }
-        });
+        if (!forevent)
+            builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    getArguments().putLong("id", -1);
+                    getArguments().putString("account", null);
+                    getArguments().putString("type", null);
+                    sendResult(RESULT_OK);
+                }
+            });
 
         builder.setPositiveButton(android.R.string.cancel, null);