diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index 1a713730..e7ee0d0b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -1140,8 +1140,11 @@ public class FragmentMessage extends FragmentEx {
                             @Override
                             protected void onLoaded(Bundle args, Boolean close) {
                                 Helper.setViewsEnabled(view, true);
-                                if (close) // archived message
+                                if (close) { // archived message
                                     getFragmentManager().popBackStack();
+                                    if (message.threaded)
+                                        getFragmentManager().popBackStack();
+                                }
                             }
 
                             @Override
@@ -1194,6 +1197,8 @@ public class FragmentMessage extends FragmentEx {
             @Override
             protected void onLoaded(Bundle args, Void result) {
                 getFragmentManager().popBackStack();
+                if (message.threaded)
+                    getFragmentManager().popBackStack();
                 Helper.setViewsEnabled(view, true);
             }