diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index c70207465b..1f1b7d4f3d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -160,7 +160,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     private boolean searching = false;
     private int lastBackStackCount = 0;
     private Snackbar lastSnackbar = null;
-    private Intent lastThread = null;
 
     static final int PI_UNIFIED = 1;
     static final int PI_WHY = 2;
@@ -720,17 +719,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 !getIntent().hasExtra(Intent.EXTRA_PROCESS_TEXT))
             init();
 
-        lastThread = null;
-        if (savedInstanceState != null) {
+        if (savedInstanceState != null)
             drawerToggle.setDrawerIndicatorEnabled(savedInstanceState.getBoolean("fair:toggle"));
 
-            Intent thread = savedInstanceState.getParcelable("fair:thread");
-            if (thread != null && content_pane != null) {
-                getSupportFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
-                onViewThread(thread);
-            }
-        }
-
         checkFirst();
         checkBanner();
         checkCrash();
@@ -800,7 +791,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         outState.putParcelable("fair:intent", getIntent());
         outState.putBoolean("fair:toggle", drawerToggle == null || drawerToggle.isDrawerIndicatorEnabled());
         outState.putBoolean("fair:searching", searching);
-        outState.putParcelable("fair:thread", lastThread);
         super.onSaveInstanceState(outState);
     }
 
@@ -1347,13 +1337,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                 boolean close_pane = prefs.getBoolean("close_pane", !Helper.isSurfaceDuo());
                 boolean thread = "thread".equals(getSupportFragmentManager().getBackStackEntryAt(count - 1).getName());
                 Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.content_pane);
-
                 int visibility = (!thread || fragment == null ? (close_pane ? View.GONE : View.INVISIBLE) : View.VISIBLE);
                 content_separator.setVisibility(visibility);
                 content_pane.setVisibility(visibility);
-
-                if (!thread)
-                    lastThread = null;
             }
         }
     }
@@ -1947,8 +1933,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
         String action = intent.getAction();
         if (action != null) {
-            lastThread = null;
-
             if (action.startsWith("unified")) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                     getSupportFragmentManager().popBackStack("unified", 0);
@@ -2437,7 +2421,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
     }
 
     private void onViewThread(Intent intent) {
-        lastThread = intent;
         boolean found = intent.getBooleanExtra("found", false);
 
         if (lastSnackbar != null && lastSnackbar.isShown())