diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4ebde3e244..1d253305af 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1384,10 +1384,24 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onExecuted(Bundle args, File ics) {
+                    String status = null;
+                    switch (action) {
+                        case R.id.btnCalendarAccept:
+                            status = context.getString(R.string.title_icalendar_accept);
+                            break;
+                        case R.id.btnCalendarDecline:
+                            status = context.getString(R.string.title_icalendar_decline);
+                            break;
+                        case R.id.btnCalendarMaybe:
+                            status = context.getString(R.string.title_icalendar_maybe);
+                            break;
+                    }
+
                     Intent reply = new Intent(context, ActivityCompose.class)
                             .putExtra("action", "participation")
                             .putExtra("reference", args.getLong("id"))
-                            .putExtra("ics", ics);
+                            .putExtra("ics", ics)
+                            .putExtra("status", status);
                     context.startActivity(reply);
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 910bac49f1..eeddbad6d5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -673,6 +673,7 @@ public class FragmentCompose extends FragmentBase {
                 args.putLong("account", a.getLong("account", -1));
                 args.putLong("reference", a.getLong("reference", -1));
                 args.putSerializable("ics", a.getSerializable("ics"));
+                args.putString("status", a.getString("status"));
                 args.putBoolean("raw", a.getBoolean("raw", false));
                 args.putLong("answer", a.getLong("answer", -1));
                 args.putString("to", a.getString("to"));
@@ -1943,6 +1944,7 @@ public class FragmentCompose extends FragmentBase {
             long id = args.getLong("id", -1);
             long reference = args.getLong("reference", -1);
             File ics = (File) args.getSerializable("ics");
+            String status = args.getString("status");
             long answer = args.getLong("answer", -1);
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@@ -2084,8 +2086,7 @@ public class FragmentCompose extends FragmentBase {
                             draft.thread = draft.msgid; // new thread
 
                         String subject = (ref.subject == null ? "" : ref.subject);
-                        if ("reply".equals(action) || "reply_all".equals(action) ||
-                                "participation".equals(action)) {
+                        if ("reply".equals(action) || "reply_all".equals(action)) {
                             if (prefix_once) {
                                 String re = context.getString(R.string.title_subject_reply, "");
                                 subject = subject.replaceAll("(?i)" + Pattern.quote(re.trim()), "").trim();
@@ -2115,7 +2116,8 @@ public class FragmentCompose extends FragmentBase {
                             body = "<p>" + context.getString(R.string.title_receipt_text) + "</p>";
                             if (!Locale.getDefault().getLanguage().equals("en"))
                                 body += "<p>" + res.getString(R.string.title_receipt_text) + "</p>";
-                        }
+                        } else if ("participation".equals(action))
+                            draft.subject = status + ": " + ref.subject;
 
                         draft.plain_only = ref.plain_only;
                         if (answer > 0)