diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 470d470de3..bfa85fda34 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -2186,8 +2186,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 String type = intent.getStringExtra("type");
                 boolean ignore = intent.getBooleanExtra("ignore", false);
                 long group = intent.getLongExtra("group", -1L);
+
                 if (ignore)
                     ServiceUI.ignore(this, id, group);
+
                 intent.putExtra("id", id);
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityView.this);
                 boolean notify_open_folder = prefs.getBoolean("notify_open_folder", false);
@@ -2772,7 +2774,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         if (lastSnackbar != null && lastSnackbar.isShown())
             lastSnackbar.dismiss();
 
-        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
+        if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
             if (found) {
                 List<Fragment> fragments = getSupportFragmentManager().getFragments();
                 if (fragments.size() > 0) {
@@ -2783,6 +2785,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             } else
                 getSupportFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
 
+            Bundle result = new Bundle();
+            result.putLong("id", intent.getLongExtra("id", -1));
+            getSupportFragmentManager().setFragmentResult("message.selected", result);
+        }
+
         Bundle args = new Bundle();
         args.putLong("account", intent.getLongExtra("account", -1));
         args.putLong("folder", intent.getLongExtra("folder", -1));