diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index d637cda56b..a3dc197c50 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1039,6 +1039,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             } else if (action.equals("widget")) {
                 long account = intent.getLongExtra("account", -1);
                 long folder = intent.getLongExtra("folder", -1);
+
+                intent.removeExtra("account");
+                intent.removeExtra("folder");
+                setIntent(intent);
+
                 if (account > 0 && folder > 0) {
                     if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
                         getSupportFragmentManager().popBackStack("messages", FragmentManager.POP_BACK_STACK_INCLUSIVE);