diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index bf6fee0122..744b9cc8a7 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -463,6 +463,8 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         if (action != null && action.startsWith("thread")) {
             intent.setAction(null);
             setIntent(intent);
+
+            getSupportFragmentManager().popBackStack("unified", 0);
             intent.putExtra("id", Long.parseLong(action.split(":")[1]));
             onViewThread(intent);
         }