diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index dc98828479..e61a736b47 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3195,9 +3195,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 fragment.setArguments(nargs);
 
                 int res = (pane ? R.id.content_pane : R.id.content_frame);
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.replace(res, fragment).addToBackStack("thread");
-                fragmentTransaction.commit();
+                if (getActivity() != null && getActivity().findViewById(res) != null) {
+                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    fragmentTransaction.replace(res, fragment).addToBackStack("thread");
+                    fragmentTransaction.commit();
+                }
             }
 
             @Override