diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index e6bb0de442..62c85be441 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -882,8 +882,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     getSupportFragmentManager().popBackStack("unified", 0);
 
                 long folder = Long.parseLong(action.split(":", 2)[1]);
-                intent.putExtra("folder", folder);
-                onViewMessages(intent);
+                if (folder > 0) {
+                    intent.putExtra("folder", folder);
+                    onViewMessages(intent);
+                }
 
             } else if ("why".equals(action)) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))