diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 1e376997d9..a19fd95d53 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -276,7 +276,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "account:enable");
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAnswer.java b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
index 776c117566..77aa67871c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAnswer.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
@@ -161,7 +161,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "rule:enable");
                 }
@@ -212,7 +212,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
             }
         }.execute(context, owner, new Bundle(), "answer:composable");
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 844b2b2698..4f840e9d01 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -201,7 +201,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "attachment:delete");
         }
@@ -283,7 +283,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "attachment:fetch");
         }
diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index 503118d84f..27b938f6ac 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -195,7 +195,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "contact:state");
         }
@@ -252,7 +252,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "contact:favorite");
                 }
@@ -279,7 +279,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "contact:delete");
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index d4e0b0b084..a8dc0ab196 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -370,7 +370,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "folder:collapse");
         }
@@ -535,7 +535,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
                     ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_SYNC);
-                    ask.show(parentFragment.getFragmentManager(), "folder:sync");
+                    ask.show(parentFragment.getParentFragmentManager(), "folder:sync");
                 }
 
                 private void onActionProperty(int property, boolean enabled) {
@@ -578,7 +578,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "folder:enable");
                 }
@@ -601,7 +601,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "folder:subscribe");
                 }
@@ -615,7 +615,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
                     ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_DELETE_LOCAL);
-                    ask.show(parentFragment.getFragmentManager(), "folder:delete_local");
+                    ask.show(parentFragment.getParentFragmentManager(), "folder:delete_local");
                 }
 
                 private void onActionEmpty(String type) {
@@ -632,7 +632,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
                     ask.setTargetFragment(parentFragment, FragmentFolders.REQUEST_EMPTY_FOLDER);
-                    ask.show(parentFragment.getFragmentManager(), "folder:empty");
+                    ask.show(parentFragment.getParentFragmentManager(), "folder:empty");
                 }
 
                 private void onActionEditRules() {
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 7a0d4a53f3..dbc6a7160f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -203,7 +203,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "identitty:enable");
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index 4ffc5e6fac..b82d60afe4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -179,7 +179,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "image:fetch");
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c28bfc1dbd..96a848626d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -897,7 +897,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                        Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
                 }.setLog(false).execute(context, owner, aargs, "message:avatar");
             } else
@@ -1206,7 +1206,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.setLog(false).execute(context, owner, sargs, "message:actions");
 
@@ -1329,7 +1329,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                 FragmentDialogLink fragment = new FragmentDialogLink();
                                 fragment.setArguments(args);
-                                fragment.show(parentFragment.getFragmentManager(), "open:link");
+                                fragment.show(parentFragment.getParentFragmentManager(), "open:link");
 
                                 return true;
                             }
@@ -1526,7 +1526,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:body");
         }
@@ -1706,7 +1706,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.setLog(false).execute(context, owner, args, "message:calendar");
         }
@@ -1849,7 +1849,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:participation");
         }
@@ -2045,7 +2045,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                             @Override
                             protected void onException(Bundle args, Throwable ex) {
-                                Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                                Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                             }
                         }.execute(context, owner, args, "message:seen");
                     }
@@ -2198,7 +2198,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:flag");
         }
@@ -2263,7 +2263,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:search");
         }
@@ -2443,7 +2443,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:attachment:download");
         }
@@ -2589,7 +2589,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "show:images");
         }
@@ -2680,7 +2680,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:reply");
         }
@@ -2751,7 +2751,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, new Bundle(), "message:answer");
         }
@@ -2772,7 +2772,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             FragmentDialogFolder fragment = new FragmentDialogFolder();
             fragment.setArguments(args);
             fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_MOVE);
-            fragment.show(parentFragment.getFragmentManager(), "message:move");
+            fragment.show(parentFragment.getParentFragmentManager(), "message:move");
         }
 
         private void onActionMoveOutbox(TupleMessageEx message) {
@@ -2834,7 +2834,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:move:draft");
         }
@@ -2852,7 +2852,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 FragmentDialogAsk ask = new FragmentDialogAsk();
                 ask.setArguments(aargs);
                 ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_DELETE);
-                ask.show(parentFragment.getFragmentManager(), "message:delete");
+                ask.show(parentFragment.getParentFragmentManager(), "message:delete");
             } else
                 properties.move(message.id, EntityFolder.TRASH);
         }
@@ -3054,7 +3054,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     else
                         ToastEx.makeText(context, R.string.title_pro_invalid, Toast.LENGTH_LONG).show();
                 } catch (NoSuchAlgorithmException ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             } else {
                 if ("cid".equals(uri.getScheme()))
@@ -3066,7 +3066,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 FragmentDialogLink fragment = new FragmentDialogLink();
                 fragment.setArguments(args);
-                fragment.show(parentFragment.getFragmentManager(), "open:link");
+                fragment.show(parentFragment.getParentFragmentManager(), "open:link");
             }
         }
 
@@ -3079,7 +3079,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             FragmentDialogImage fragment = new FragmentDialogImage();
             fragment.setArguments(args);
-            fragment.show(parentFragment.getFragmentManager(), "view:image");
+            fragment.show(parentFragment.getParentFragmentManager(), "view:image");
         }
 
         private void onMenuEditAsNew(final TupleMessageEx message) {
@@ -3128,7 +3128,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:unseen");
         }
@@ -3165,7 +3165,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:hide");
         }
@@ -3179,7 +3179,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             FragmentDialogColor fragment = new FragmentDialogColor();
             fragment.setArguments(args);
             fragment.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_COLOR);
-            fragment.show(parentFragment.getFragmentManager(), "message:color");
+            fragment.show(parentFragment.getParentFragmentManager(), "message:color");
         }
 
         private void onMenuDelete(final TupleMessageEx message) {
@@ -3190,7 +3190,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
             ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_DELETE);
-            ask.show(parentFragment.getFragmentManager(), "message:delete");
+            ask.show(parentFragment.getParentFragmentManager(), "message:delete");
         }
 
         private void onMenuJunk(final TupleMessageEx message) {
@@ -3203,7 +3203,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
             ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_MESSAGE_JUNK);
-            ask.show(parentFragment.getFragmentManager(), "message:junk");
+            ask.show(parentFragment.getParentFragmentManager(), "message:junk");
         }
 
         private void onMenuResync(TupleMessageEx message) {
@@ -3236,7 +3236,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:share");
         }
@@ -3283,12 +3283,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     FragmentKeywordManage fragment = new FragmentKeywordManage();
                     fragment.setArguments(args);
-                    fragment.show(parentFragment.getFragmentManager(), "keyword:manage");
+                    fragment.show(parentFragment.getParentFragmentManager(), "keyword:manage");
                 }
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:keywords");
         }
@@ -3345,7 +3345,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:share");
         }
@@ -3369,7 +3369,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
             ask.setTargetFragment(parentFragment, FragmentMessages.REQUEST_PRINT);
-            ask.show(parentFragment.getFragmentManager(), "message:print");
+            ask.show(parentFragment.getParentFragmentManager(), "message:print");
         }
 
         private void onMenuShowHeaders(TupleMessageEx message) {
@@ -3409,7 +3409,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                        Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
                 }.execute(context, owner, args, "message:headers");
             } else
@@ -3446,7 +3446,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                    Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             }.execute(context, owner, args, "message:raw");
         }
@@ -4301,7 +4301,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, getArguments(), "view:image");
 
@@ -4386,7 +4386,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                 @Override
                                 protected void onException(Bundle args, Throwable ex) {
-                                    Helper.unexpectedError(getFragmentManager(), ex);
+                                    Helper.unexpectedError(getParentFragmentManager(), ex);
                                 }
                             }.execute(getContext(), getActivity(), args, "message:keywords:manage");
                         }
@@ -4399,7 +4399,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                             FragmentKeywordAdd fragment = new FragmentKeywordAdd();
                             fragment.setArguments(args);
-                            fragment.show(getFragmentManager(), "keyword:add");
+                            fragment.show(getParentFragmentManager(), "keyword:add");
                         }
                     })
                     .setNegativeButton(android.R.string.cancel, null)
@@ -4450,7 +4450,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                     @Override
                                     protected void onException(Bundle args, Throwable ex) {
-                                        Helper.unexpectedError(getFragmentManager(), ex);
+                                        Helper.unexpectedError(getParentFragmentManager(), ex);
                                     }
                                 }.execute(getContext(), getActivity(), args, "message:keyword:add");
                             }
diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 9411288dca..36b398ad83 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -144,7 +144,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                        Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
                 }.execute(context, owner, args, "operation:open:folder");
             } else {
@@ -171,7 +171,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                        Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                     }
                 }.execute(context, owner, args, "operation:open:message");
             }
@@ -224,7 +224,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "operation:delete");
                 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index b4e8b32bd1..17c50e9432 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -244,7 +244,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "rule:enable");
                 }
@@ -299,7 +299,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(parentFragment.getFragmentManager(), ex);
+                            Helper.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                         }
                     }.execute(context, owner, args, "rule:execute");
                 }
@@ -314,7 +314,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                     FragmentDialogFolder fragment = new FragmentDialogFolder();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(parentFragment, FragmentRules.REQUEST_MOVE);
-                    fragment.show(parentFragment.getFragmentManager(), "rule:move");
+                    fragment.show(parentFragment.getParentFragmentManager(), "rule:move");
                 }
 
                 private void onActionCopy() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index d56edc2302..20380f94a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -86,6 +86,6 @@ public class FragmentAbout extends FragmentBase {
         args.putString("name", "ATTRIBUTION.md");
         FragmentDialogMarkdown fragment = new FragmentDialogMarkdown();
         fragment.setArguments(args);
-        fragment.show(getFragmentManager(), "privacy");
+        fragment.show(getParentFragmentManager(), "privacy");
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index d5bcef8a69..ade9de1bef 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -315,7 +315,7 @@ public class FragmentAccount extends FragmentBase {
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentAccount.this, REQUEST_COLOR);
-                fragment.show(getFragmentManager(), "account:color");
+                fragment.show(getParentFragmentManager(), "account:color");
             }
         });
 
@@ -474,7 +474,7 @@ public class FragmentAccount extends FragmentBase {
                 if (ex instanceof IllegalArgumentException || ex instanceof UnknownHostException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "account:config");
     }
@@ -1076,9 +1076,9 @@ public class FragmentAccount extends FragmentBase {
                     FragmentDialogAsk fragment = new FragmentDialogAsk();
                     fragment.setArguments(aargs);
                     fragment.setTargetFragment(FragmentAccount.this, REQUEST_SAVE);
-                    fragment.show(getFragmentManager(), "account:save");
+                    fragment.show(getParentFragmentManager(), "account:save");
                 } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
@@ -1217,7 +1217,7 @@ public class FragmentAccount extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentAccount.this, new Bundle(), "account:primary");
                 } else {
@@ -1268,7 +1268,7 @@ public class FragmentAccount extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentAccount.this, args, "account:folders");
                 }
@@ -1276,7 +1276,7 @@ public class FragmentAccount extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "account:get");
     }
@@ -1311,7 +1311,7 @@ public class FragmentAccount extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
         fragment.setTargetFragment(FragmentAccount.this, REQUEST_DELETE);
-        fragment.show(getFragmentManager(), "account:delete");
+        fragment.show(getParentFragmentManager(), "account:delete");
     }
 
     @Override
@@ -1339,7 +1339,7 @@ public class FragmentAccount extends FragmentBase {
                         });
                         onSave(false);
                     } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                        getFragmentManager().popBackStack();
+                        getParentFragmentManager().popBackStack();
                     break;
                 case REQUEST_DELETE:
                     if (resultCode == RESULT_OK)
@@ -1377,12 +1377,12 @@ public class FragmentAccount extends FragmentBase {
             @Override
             protected void onExecuted(Bundle args, Void data) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "account:delete");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index f27f030e50..8ab96077f4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -149,7 +149,7 @@ public class FragmentAccounts extends FragmentBase {
                     private void onCreate(boolean imap) {
                         FragmentBase fragment = imap ? new FragmentAccount() : new FragmentPop();
                         fragment.setArguments(new Bundle());
-                        FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                        FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                         fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("account");
                         fragmentTransaction.commit();
                     }
@@ -192,7 +192,7 @@ public class FragmentAccounts extends FragmentBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentAccounts.this, args, "account:drafts");
 
@@ -281,7 +281,7 @@ public class FragmentAccounts extends FragmentBase {
             @Override
             public void onSearch(String query) {
                 FragmentMessages.search(
-                        getContext(), getViewLifecycleOwner(), getFragmentManager(),
+                        getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
                         -1, false, query);
             }
         });
@@ -355,7 +355,7 @@ public class FragmentAccounts extends FragmentBase {
                 } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folders:refresh");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 894bf0dd1b..0770c7ac6d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -116,7 +116,7 @@ public class FragmentAnswer extends FragmentBase {
         ibInfo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                new FragmentInfo().show(getFragmentManager(), "rule:info");
+                new FragmentInfo().show(getParentFragmentManager(), "rule:info");
             }
         });
 
@@ -178,7 +178,7 @@ public class FragmentAnswer extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "answer:get");
     }
@@ -190,7 +190,7 @@ public class FragmentAnswer extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(args);
         fragment.setTargetFragment(FragmentAnswer.this, REQUEST_DELETE);
-        fragment.show(getFragmentManager(), "answer:delete");
+        fragment.show(getParentFragmentManager(), "answer:delete");
     }
 
     private void onActionSave() {
@@ -245,7 +245,7 @@ public class FragmentAnswer extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "answer:save");
     }
@@ -304,7 +304,7 @@ public class FragmentAnswer extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "answer:delete");
     }
@@ -329,7 +329,7 @@ public class FragmentAnswer extends FragmentBase {
             FragmentDialogLink fragment = new FragmentDialogLink();
             fragment.setArguments(args);
             fragment.setTargetFragment(this, REQUEST_LINK);
-            fragment.show(getFragmentManager(), "compose:link");
+            fragment.show(getParentFragmentManager(), "compose:link");
 
             return true;
         } else
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
index 47c926ba57..91ce2129d3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java
@@ -91,7 +91,7 @@ public class FragmentAnswers extends FragmentBase {
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                 fragmentTransaction.replace(R.id.content_frame, new FragmentAnswer()).addToBackStack("answer");
                 fragmentTransaction.commit();
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java
index a5f07339d5..9f17e0128b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentBase.java
+++ b/app/src/main/java/eu/faircode/email/FragmentBase.java
@@ -40,6 +40,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Lifecycle;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
@@ -109,7 +110,7 @@ public class FragmentBase extends Fragment {
 
     protected void finish() {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            getFragmentManager().popBackStack();
+            getParentFragmentManager().popBackStack();
         else
             finish = true;
     }
@@ -170,7 +171,7 @@ public class FragmentBase extends Fragment {
         super.onResume();
         updateSubtitle();
         if (finish) {
-            getFragmentManager().popBackStack();
+            getParentFragmentManager().popBackStack();
             finish = false;
         }
 
@@ -376,7 +377,7 @@ public class FragmentBase extends Fragment {
                 if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException)
                     ToastEx.makeText(getContext(), ex.getMessage(), Toast.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "attachment:save");
     }
@@ -449,7 +450,7 @@ public class FragmentBase extends Fragment {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "attachments:save");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index d659d10e6e..9aab501f70 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -377,7 +377,7 @@ public class FragmentCompose extends FragmentBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentCompose.this, args, "draft:signature");
             }
@@ -622,7 +622,7 @@ public class FragmentCompose extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(args);
         fragment.setTargetFragment(this, REQUEST_REF_DELETE);
-        fragment.show(getFragmentManager(), "compose:refdelete");
+        fragment.show(getParentFragmentManager(), "compose:refdelete");
     }
 
     private void onReferenceDeleteConfirmed() {
@@ -669,7 +669,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:refdelete");
     }
@@ -760,7 +760,7 @@ public class FragmentCompose extends FragmentBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentCompose.this, args, "compose:convert");
             }
@@ -1011,7 +1011,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:encrypt");
     }
@@ -1070,7 +1070,7 @@ public class FragmentCompose extends FragmentBase {
         FragmentDialogContactGroup fragment = new FragmentDialogContactGroup();
         fragment.setArguments(args);
         fragment.setTargetFragment(this, REQUEST_CONTACT_GROUP);
-        fragment.show(getFragmentManager(), "compose:groups");
+        fragment.show(getParentFragmentManager(), "compose:groups");
     }
 
     private void onMenuAnswer() {
@@ -1082,7 +1082,7 @@ public class FragmentCompose extends FragmentBase {
         FragmentDialogAnswer fragment = new FragmentDialogAnswer();
         fragment.setArguments(new Bundle());
         fragment.setTargetFragment(this, REQUEST_ANSWER);
-        fragment.show(getFragmentManager(), "compose:answer");
+        fragment.show(getParentFragmentManager(), "compose:answer");
     }
 
     private boolean onActionStyle(int action) {
@@ -1100,7 +1100,7 @@ public class FragmentCompose extends FragmentBase {
             FragmentDialogColor fragment = new FragmentDialogColor();
             fragment.setArguments(args);
             fragment.setTargetFragment(FragmentCompose.this, REQUEST_COLOR);
-            fragment.show(getFragmentManager(), "account:color");
+            fragment.show(getParentFragmentManager(), "account:color");
             return true;
         } else
             return StyleHelper.apply(action, etBody);
@@ -1164,7 +1164,7 @@ public class FragmentCompose extends FragmentBase {
         FragmentDialogLink fragment = new FragmentDialogLink();
         fragment.setArguments(args);
         fragment.setTargetFragment(this, REQUEST_LINK);
-        fragment.show(getFragmentManager(), "compose:link");
+        fragment.show(getParentFragmentManager(), "compose:link");
     }
 
     private void onActionDiscard() {
@@ -1177,7 +1177,7 @@ public class FragmentCompose extends FragmentBase {
             FragmentDialogAsk fragment = new FragmentDialogAsk();
             fragment.setArguments(args);
             fragment.setTargetFragment(this, REQUEST_DISCARD);
-            fragment.show(getFragmentManager(), "compose:discard");
+            fragment.show(getParentFragmentManager(), "compose:discard");
         }
     }
 
@@ -1210,7 +1210,7 @@ public class FragmentCompose extends FragmentBase {
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else {
                     Log.e(ex);
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }
         else {
@@ -1376,7 +1376,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:picked");
     }
@@ -1444,7 +1444,7 @@ public class FragmentCompose extends FragmentBase {
                 else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.toString(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:attachment:add");
     }
@@ -1648,7 +1648,7 @@ public class FragmentCompose extends FragmentBase {
                                 null, 0, 0, 0, null);
                     } catch (IntentSender.SendIntentException ex) {
                         Log.e(ex);
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
             }
 
@@ -1657,7 +1657,7 @@ public class FragmentCompose extends FragmentBase {
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:encrypt");
     }
@@ -1753,7 +1753,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:picked");
     }
@@ -2579,7 +2579,7 @@ public class FragmentCompose extends FragmentBase {
                 });
                 snackbar.show();
             } else
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
         }
     };
 
@@ -3026,7 +3026,7 @@ public class FragmentCompose extends FragmentBase {
                     FragmentDialogSend fragment = new FragmentDialogSend();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
-                    fragment.show(getFragmentManager(), "compose:send");
+                    fragment.show(getParentFragmentManager(), "compose:send");
                 } else {
                     if (encrypt)
                         onEncrypt();
@@ -3052,7 +3052,7 @@ public class FragmentCompose extends FragmentBase {
                     ex instanceof AddressException || ex instanceof UnknownHostException)
                 Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
             else
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
         }
 
         private String getActionName(int id) {
@@ -3108,7 +3108,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:show");
     }
@@ -3251,7 +3251,7 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "compose:show");
     }
@@ -3380,7 +3380,7 @@ public class FragmentCompose extends FragmentBase {
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "compose:answer");
 
@@ -3479,7 +3479,7 @@ public class FragmentCompose extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentDialogSend.this, args, "compose:plain_only");
                 }
@@ -3506,7 +3506,7 @@ public class FragmentCompose extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentDialogSend.this, args, "compose:encrypt");
                 }
@@ -3535,7 +3535,7 @@ public class FragmentCompose extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentDialogSend.this, args, "compose:receipt");
                 }
@@ -3576,7 +3576,7 @@ public class FragmentCompose extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentDialogSend.this, args, "compose:priority");
                 }
@@ -3592,7 +3592,7 @@ public class FragmentCompose extends FragmentBase {
                     FragmentDialogDuration fragment = new FragmentDialogDuration();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentDialogSend.this, 1);
-                    fragment.show(getFragmentManager(), "send:snooze");
+                    fragment.show(getParentFragmentManager(), "send:snooze");
                 }
             });
 
@@ -3682,7 +3682,7 @@ public class FragmentCompose extends FragmentBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(this, args, "compose:snooze");
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentContacts.java b/app/src/main/java/eu/faircode/email/FragmentContacts.java
index efa7a0f294..0bce75015d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentContacts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentContacts.java
@@ -153,7 +153,7 @@ public class FragmentContacts extends FragmentBase {
                 onMenuHelp();
                 return true;
             case R.id.menu_delete:
-                new FragmentDelete().show(getFragmentManager(), "contacts:delete");
+                new FragmentDelete().show(getParentFragmentManager(), "contacts:delete");
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -191,7 +191,7 @@ public class FragmentContacts extends FragmentBase {
 
                                 @Override
                                 protected void onException(Bundle args, Throwable ex) {
-                                    Helper.unexpectedError(getFragmentManager(), ex);
+                                    Helper.unexpectedError(getParentFragmentManager(), ex);
                                 }
                             }.execute(getContext(), getActivity(), new Bundle(), "contacts:delete");
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index 885970fb29..ec86d4085b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -104,7 +104,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:select");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
index 08129f0f61..cfd9284277 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java
@@ -88,7 +88,7 @@ public class FragmentDialogMarkdown extends FragmentDialogBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, getArguments(), "markdown:read");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 8c3ee294ab..114ed387b5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -137,7 +137,7 @@ public class FragmentFolder extends FragmentBase {
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentFolder.this, REQUEST_COLOR);
-                fragment.show(getFragmentManager(), "account:color");
+                fragment.show(getParentFragmentManager(), "account:color");
             }
         });
 
@@ -253,7 +253,7 @@ public class FragmentFolder extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:get");
     }
@@ -283,7 +283,7 @@ public class FragmentFolder extends FragmentBase {
                         });
                         onSave(false);
                     } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                        getFragmentManager().popBackStack();
+                        getParentFragmentManager().popBackStack();
                     break;
 
                 case REQUEST_DELETE_FOLDER:
@@ -326,7 +326,7 @@ public class FragmentFolder extends FragmentBase {
         FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
         ask.setTargetFragment(FragmentFolder.this, REQUEST_DELETE_FOLDER);
-        ask.show(getFragmentManager(), "folder:delete");
+        ask.show(getParentFragmentManager(), "folder:delete");
     }
 
     private void onSave(boolean should) {
@@ -518,9 +518,9 @@ public class FragmentFolder extends FragmentBase {
                     FragmentDialogAsk ask = new FragmentDialogAsk();
                     ask.setArguments(aargs);
                     ask.setTargetFragment(FragmentFolder.this, REQUEST_SAVE_CHANGES);
-                    ask.show(getFragmentManager(), "folder:save");
+                    ask.show(getParentFragmentManager(), "folder:save");
                 } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
@@ -528,7 +528,7 @@ public class FragmentFolder extends FragmentBase {
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:save");
     }
@@ -561,7 +561,7 @@ public class FragmentFolder extends FragmentBase {
             @Override
             protected void onExecuted(Bundle args, Void data) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
@@ -572,7 +572,7 @@ public class FragmentFolder extends FragmentBase {
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:delete");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index e077f34944..0ebaba4ba0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -178,7 +178,7 @@ public class FragmentFolders extends FragmentBase {
                     args.putLong("account", account);
                     FragmentFolder fragment = new FragmentFolder();
                     fragment.setArguments(args);
-                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                     fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folder");
                     fragmentTransaction.commit();
                 }
@@ -216,7 +216,7 @@ public class FragmentFolders extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentFolders.this, new Bundle(), "folders:drafts");
 
@@ -369,7 +369,7 @@ public class FragmentFolders extends FragmentBase {
                 } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folders:refresh");
     }
@@ -389,7 +389,7 @@ public class FragmentFolders extends FragmentBase {
             @Override
             public void onSearch(String query) {
                 FragmentMessages.search(
-                        getContext(), getViewLifecycleOwner(), getFragmentManager(),
+                        getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
                         -1, false, query);
             }
         });
@@ -519,7 +519,7 @@ public class FragmentFolders extends FragmentBase {
                 } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:sync");
     }
@@ -552,7 +552,7 @@ public class FragmentFolders extends FragmentBase {
 
             @Override
             public void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:delete:local");
     }
@@ -592,7 +592,7 @@ public class FragmentFolders extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:delete");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index 9d810d2a22..d445d5ee59 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -391,7 +391,7 @@ public class FragmentGmail extends FragmentBase {
                 FragmentReview fragment = new FragmentReview();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentGmail.this, ActivitySetup.REQUEST_DONE);
-                fragment.show(getFragmentManager(), "quick:review");
+                fragment.show(getParentFragmentManager(), "quick:review");
             }
 
             @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
index cf5010712b..a4dd60a4b9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
@@ -95,7 +95,7 @@ public class FragmentIdentities extends FragmentBase {
             public void onClick(View view) {
                 FragmentIdentity fragment = new FragmentIdentity();
                 fragment.setArguments(new Bundle());
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                 fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
                 fragmentTransaction.commit();
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index d625e7ca2e..e113055f47 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -286,7 +286,7 @@ public class FragmentIdentity extends FragmentBase {
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentIdentity.this, REQUEST_COLOR);
-                fragment.show(getFragmentManager(), "identity:color");
+                fragment.show(getParentFragmentManager(), "identity:color");
             }
         });
 
@@ -321,7 +321,7 @@ public class FragmentIdentity extends FragmentBase {
                 FragmentDialogHtml fragment = new FragmentDialogHtml();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentIdentity.this, REQUEST_HTML);
-                fragment.show(getFragmentManager(), "identity:html");
+                fragment.show(getParentFragmentManager(), "identity:html");
             }
         });
 
@@ -474,7 +474,7 @@ public class FragmentIdentity extends FragmentBase {
                 if (ex instanceof IllegalArgumentException || ex instanceof UnknownHostException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "identity:config");
     }
@@ -780,9 +780,9 @@ public class FragmentIdentity extends FragmentBase {
                     FragmentDialogAsk fragment = new FragmentDialogAsk();
                     fragment.setArguments(aargs);
                     fragment.setTargetFragment(FragmentIdentity.this, REQUEST_SAVE);
-                    fragment.show(getFragmentManager(), "identity:save");
+                    fragment.show(getParentFragmentManager(), "identity:save");
                 } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
@@ -894,7 +894,7 @@ public class FragmentIdentity extends FragmentBase {
 
                             @Override
                             protected void onException(Bundle args, Throwable ex) {
-                                Helper.unexpectedError(getFragmentManager(), ex);
+                                Helper.unexpectedError(getParentFragmentManager(), ex);
                             }
                         }.execute(FragmentIdentity.this, new Bundle(), "identity:count");
                 } else {
@@ -984,14 +984,14 @@ public class FragmentIdentity extends FragmentBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentIdentity.this, args, "identity:accounts:get");
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "identity:get");
     }
@@ -1026,7 +1026,7 @@ public class FragmentIdentity extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
         fragment.setTargetFragment(FragmentIdentity.this, REQUEST_DELETE);
-        fragment.show(getFragmentManager(), "identity:delete");
+        fragment.show(getParentFragmentManager(), "identity:delete");
     }
 
     @Override
@@ -1054,7 +1054,7 @@ public class FragmentIdentity extends FragmentBase {
                         });
                         onSave(false);
                     } else if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                        getFragmentManager().popBackStack();
+                        getParentFragmentManager().popBackStack();
                     break;
                 case REQUEST_DELETE:
                     if (resultCode == RESULT_OK)
@@ -1096,12 +1096,12 @@ public class FragmentIdentity extends FragmentBase {
             @Override
             protected void onExecuted(Bundle args, Void data) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "identity:delete");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5f0ee10a63..87e7ed38a0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -711,7 +711,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentMessages.this, args, "messages:move");
             }
@@ -727,7 +727,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 FragmentDialogDuration fragment = new FragmentDialogDuration();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_SNOOZE);
-                fragment.show(getFragmentManager(), "message:snooze");
+                fragment.show(getParentFragmentManager(), "message:snooze");
             }
         });
 
@@ -760,7 +760,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     FragmentDialogIdentity fragment = new FragmentDialogIdentity();
                     fragment.setArguments(args);
-                    fragment.show(getFragmentManager(), "messages:identities");
+                    fragment.show(getParentFragmentManager(), "messages:identities");
                 }
             }
         });
@@ -799,7 +799,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentMessages.this, args, "messages:drafts");
 
@@ -857,7 +857,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                     FragmentDialogFolder fragment = new FragmentDialogFolder();
                                     fragment.setArguments(args);
                                     fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_SEARCH);
-                                    fragment.show(getFragmentManager(), "messages:search");
+                                    fragment.show(getParentFragmentManager(), "messages:search");
 
                                     return true;
                                 }
@@ -868,11 +868,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentMessages.this, args, "messages:search");
                 } else
-                    search(getContext(), getViewLifecycleOwner(), getFragmentManager(), folder, true, query);
+                    search(getContext(), getViewLifecycleOwner(), getParentFragmentManager(), folder, true, query);
             }
         });
 
@@ -1196,7 +1196,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 } else if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:refresh");
     }
@@ -1337,7 +1337,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(FragmentMessages.this, args, "messages:move");
         }
@@ -1595,7 +1595,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     FragmentDialogDuration fragment = new FragmentDialogDuration();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_SNOOZE);
-                    fragment.show(getFragmentManager(), "message:snooze");
+                    fragment.show(getParentFragmentManager(), "message:snooze");
                 }
 
                 private void onMenuColor() {
@@ -1607,7 +1607,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     FragmentDialogColor fragment = new FragmentDialogColor();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_MESSAGE_COLOR);
-                    fragment.show(getFragmentManager(), "message:color");
+                    fragment.show(getParentFragmentManager(), "message:color");
                 }
 
                 private void onMenuMove() {
@@ -1622,7 +1622,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     FragmentDialogFolder fragment = new FragmentDialogFolder();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGE_MOVE);
-                    fragment.show(getFragmentManager(), "message:move");
+                    fragment.show(getParentFragmentManager(), "message:move");
                 }
             });
 
@@ -1685,7 +1685,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     if (ex instanceof IllegalArgumentException)
                         Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                     else
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(FragmentMessages.this, args, "messages:swipe");
         }
@@ -1864,7 +1864,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:more");
     }
@@ -1920,7 +1920,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:seen");
     }
@@ -1962,7 +1962,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogDuration fragment = new FragmentDialogDuration();
         fragment.setArguments(args);
         fragment.setTargetFragment(this, REQUEST_MESSAGES_SNOOZE);
-        fragment.show(getFragmentManager(), "messages:snooze");
+        fragment.show(getParentFragmentManager(), "messages:snooze");
     }
 
     private void onActionFlagSelection(boolean flagged, Integer color) {
@@ -2007,7 +2007,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:flag");
     }
@@ -2020,7 +2020,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogColor fragment = new FragmentDialogColor();
         fragment.setArguments(args);
         fragment.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_COLOR);
-        fragment.show(getFragmentManager(), "messages:color");
+        fragment.show(getParentFragmentManager(), "messages:color");
     }
 
     private void onActionDeleteSelection() {
@@ -2067,12 +2067,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 FragmentDialogAsk ask = new FragmentDialogAsk();
                 ask.setArguments(aargs);
                 ask.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_DELETE);
-                ask.show(getFragmentManager(), "messages:delete");
+                ask.show(getParentFragmentManager(), "messages:delete");
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:delete:ask");
     }
@@ -2087,7 +2087,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
         ask.setTargetFragment(FragmentMessages.this, REQUEST_MESSAGES_JUNK);
-        ask.show(getFragmentManager(), "messages:junk");
+        ask.show(getParentFragmentManager(), "messages:junk");
     }
 
     private void onActionMoveSelection(final String type) {
@@ -2141,7 +2141,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:move");
     }
@@ -2155,7 +2155,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogFolder fragment = new FragmentDialogFolder();
         fragment.setArguments(args);
         fragment.setTargetFragment(FragmentMessages.this, FragmentMessages.REQUEST_MESSAGES_MOVE);
-        fragment.show(getFragmentManager(), "messages:move");
+        fragment.show(getParentFragmentManager(), "messages:move");
     }
 
     private void onActionMoveSelection(long target) {
@@ -2205,7 +2205,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:move");
     }
@@ -2544,7 +2544,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 @Override
                 public void onClick(View v) {
                     snackbar.dismiss();
-                    new FragmentDialogReporting().show(getFragmentManager(), "reporting");
+                    new FragmentDialogReporting().show(getParentFragmentManager(), "reporting");
                 }
             });
 
@@ -2567,7 +2567,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             @Override
             public void onSearch(String query) {
                 FragmentMessages.search(
-                        getContext(), getViewLifecycleOwner(), getFragmentManager(),
+                        getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
                         folder, false, query);
             }
         });
@@ -2586,7 +2586,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 FragmentDialogAccount fragment = new FragmentDialogAccount();
                 fragment.setArguments(new Bundle());
                 fragment.setTargetFragment(FragmentMessages.this, REQUEST_ACCOUNT);
-                fragment.show(getFragmentManager(), "messages:accounts");
+                fragment.show(getParentFragmentManager(), "messages:accounts");
                 return true;
             }
         });
@@ -2778,7 +2778,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
     private void onMenuFolders(long account) {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-            getFragmentManager().popBackStack("unified", 0);
+            getParentFragmentManager().popBackStack("unified", 0);
 
         Bundle args = new Bundle();
         args.putLong("account", account);
@@ -2786,7 +2786,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentFolders fragment = new FragmentFolders();
         fragment.setArguments(args);
 
-        FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+        FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
         fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("folders");
         fragmentTransaction.commit();
     }
@@ -2894,7 +2894,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
         ask.setTargetFragment(this, FragmentMessages.REQUEST_EMPTY_FOLDER);
-        ask.show(getFragmentManager(), "messages:empty");
+        ask.show(getParentFragmentManager(), "messages:empty");
     }
 
     private void onMenuForceSync() {
@@ -2998,7 +2998,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "search:reset");
         } else
@@ -3056,7 +3056,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     FragmentDialogError fragment = new FragmentDialogError();
                     fragment.setArguments(args);
-                    fragment.show(getFragmentManager(), "boundary:error");
+                    fragment.show(getParentFragmentManager(), "boundary:error");
                 }
         }
     };
@@ -3285,7 +3285,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.setLog(false).execute(this, args, "messages:navigation");
         }
@@ -3367,7 +3367,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.setLog(false).execute(this, args, "messages:expand");
     }
@@ -3406,7 +3406,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 }
 
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                    getParentFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
 
                 getArguments().putBoolean("fade", true);
                 getArguments().putBoolean("left", left);
@@ -3426,7 +3426,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 int res = (pane ? R.id.content_pane : R.id.content_frame);
                 if (getActivity() != null && getActivity().findViewById(res) != null) {
-                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                    FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                     fragmentTransaction.replace(res, fragment).addToBackStack("thread");
                     fragmentTransaction.commit();
                 }
@@ -3434,7 +3434,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:navigate");
     }
@@ -3459,7 +3459,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         FragmentDialogAsk ask = new FragmentDialogAsk();
         ask.setArguments(aargs);
         ask.setTargetFragment(FragmentMessages.this, REQUEST_ASKED_MOVE);
-        ask.show(getFragmentManager(), "messages:move");
+        ask.show(getParentFragmentManager(), "messages:move");
     }
 
     private void moveAskConfirmed(ArrayList<MessageTarget> result) {
@@ -3500,7 +3500,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:move");
     }
@@ -3545,7 +3545,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentMessages.this, args, "messages:undo");
             }
@@ -3784,7 +3784,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     if (resultCode == RESULT_OK && data != null) {
                         Bundle args = data.getBundleExtra("args");
                         search(
-                                getContext(), getViewLifecycleOwner(), getFragmentManager(),
+                                getContext(), getViewLifecycleOwner(), getParentFragmentManager(),
                                 args.getLong("folder"), true, args.getString("query"));
                     }
                     break;
@@ -3873,7 +3873,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "raw:save");
     }
@@ -4041,7 +4041,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 REQUEST_DECRYPT,
                                 null, 0, 0, 0, null);
                     } catch (IntentSender.SendIntentException ex) {
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                     }
             }
 
@@ -4050,7 +4050,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (ex instanceof IllegalArgumentException)
                     Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                 else
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "decrypt");
     }
@@ -4106,7 +4106,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "message:delete");
     }
@@ -4141,7 +4141,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:delete:execute");
     }
@@ -4176,7 +4176,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "message:junk");
     }
@@ -4197,7 +4197,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             FragmentDialogAsk ask = new FragmentDialogAsk();
             ask.setArguments(aargs);
             ask.setTargetFragment(FragmentMessages.this, REQUEST_ASKED_MOVE_ACROSS);
-            ask.show(getFragmentManager(), "messages:move:across");
+            ask.show(getParentFragmentManager(), "messages:move:across");
         } else
             moveAskConfirmed(result);
     }
@@ -4234,7 +4234,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "message:color");
     }
@@ -4282,7 +4282,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "message:snooze");
     }
@@ -4336,7 +4336,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "messages:snooze");
     }
@@ -4390,7 +4390,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "message:move");
     }
@@ -4526,7 +4526,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, pargs, "message:print");
     }
@@ -4566,7 +4566,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "folder:delete");
     }
@@ -4716,7 +4716,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "messages:accounts");
 
@@ -4811,7 +4811,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "identity:select");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOperations.java b/app/src/main/java/eu/faircode/email/FragmentOperations.java
index e34c10d114..141c6d4640 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOperations.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOperations.java
@@ -114,7 +114,7 @@ public class FragmentOperations extends FragmentBase {
                 onMenuHelp();
                 return true;
             case R.id.menu_delete:
-                new DialogDelete().show(getFragmentManager(), "operations:delete");
+                new DialogDelete().show(getParentFragmentManager(), "operations:delete");
                 return true;
 
             default:
@@ -152,7 +152,7 @@ public class FragmentOperations extends FragmentBase {
 
                                 @Override
                                 protected void onException(Bundle args, Throwable ex) {
-                                    Helper.unexpectedError(getFragmentManager(), ex);
+                                    Helper.unexpectedError(getParentFragmentManager(), ex);
                                 }
                             }.execute(getContext(), getActivity(), new Bundle(), "operations:delete");
                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index a662163f3b..704bb17183 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -132,7 +132,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         btnTheme.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                new FragmentDialogTheme().show(getFragmentManager(), "setup:theme");
+                new FragmentDialogTheme().show(getParentFragmentManager(), "setup:theme");
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index a58a694ce8..2f72f83c24 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -306,7 +306,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, new Bundle(), "cleanup:run");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
index fc24c50324..28c48a2d24 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
@@ -151,7 +151,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
                 args.putBoolean("start", true);
                 DialogFragment timePicker = new TimePickerFragment();
                 timePicker.setArguments(args);
-                timePicker.show(getFragmentManager(), "timePicker");
+                timePicker.show(getParentFragmentManager(), "timePicker");
             }
         });
 
@@ -162,7 +162,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
                 args.putBoolean("start", false);
                 DialogFragment timePicker = new TimePickerFragment();
                 timePicker.setArguments(args);
-                timePicker.show(getFragmentManager(), "timePicker");
+                timePicker.show(getParentFragmentManager(), "timePicker");
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOrder.java b/app/src/main/java/eu/faircode/email/FragmentOrder.java
index 3aca699aa5..855d036b05 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOrder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOrder.java
@@ -116,7 +116,7 @@ public class FragmentOrder extends FragmentBase {
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "order:accounts");
         else if (TupleFolderSort.class.getName().equals(clazz))
@@ -142,7 +142,7 @@ public class FragmentOrder extends FragmentBase {
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, new Bundle(), "order:folders");
         else
@@ -218,7 +218,7 @@ public class FragmentOrder extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "order:set");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index 1f422d46a4..6d1fd2830b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -139,7 +139,7 @@ public class FragmentPop extends FragmentBase {
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentPop.this, REQUEST_COLOR);
-                fragment.show(getFragmentManager(), "account:color");
+                fragment.show(getParentFragmentManager(), "account:color");
             }
         });
 
@@ -389,7 +389,7 @@ public class FragmentPop extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, Boolean dirty) {
-                getFragmentManager().popBackStack();
+                getParentFragmentManager().popBackStack();
             }
 
             @Override
@@ -467,7 +467,7 @@ public class FragmentPop extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentPop.this, new Bundle(), "account:primary");
                 } else {
@@ -483,7 +483,7 @@ public class FragmentPop extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "account:get");
     }
@@ -518,7 +518,7 @@ public class FragmentPop extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(aargs);
         fragment.setTargetFragment(FragmentPop.this, REQUEST_DELETE);
-        fragment.show(getFragmentManager(), "account:delete");
+        fragment.show(getParentFragmentManager(), "account:delete");
     }
 
     @Override
@@ -572,12 +572,12 @@ public class FragmentPop extends FragmentBase {
             @Override
             protected void onExecuted(Bundle args, Void data) {
                 if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
-                    getFragmentManager().popBackStack();
+                    getParentFragmentManager().popBackStack();
             }
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "account:delete");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 21a4ef873e..428f529a37 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -358,7 +358,7 @@ public class FragmentQuickSetup extends FragmentBase {
                     FragmentReview fragment = new FragmentReview();
                     fragment.setArguments(args);
                     fragment.setTargetFragment(FragmentQuickSetup.this, ActivitySetup.REQUEST_DONE);
-                    fragment.show(getFragmentManager(), "quick:review");
+                    fragment.show(getParentFragmentManager(), "quick:review");
                 }
             }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index c9f65bde57..ae039c5539 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -308,7 +308,7 @@ public class FragmentRule extends FragmentBase {
                 DialogFragment timePicker = new TimePickerFragment();
                 timePicker.setArguments(args);
                 timePicker.setTargetFragment(FragmentRule.this, REQUEST_SCHEDULE_START);
-                timePicker.show(getFragmentManager(), "timePicker");
+                timePicker.show(getParentFragmentManager(), "timePicker");
             }
         });
 
@@ -321,7 +321,7 @@ public class FragmentRule extends FragmentBase {
                 DialogFragment timePicker = new TimePickerFragment();
                 timePicker.setArguments(args);
                 timePicker.setTargetFragment(FragmentRule.this, REQUEST_SCHEDULE_END);
-                timePicker.show(getFragmentManager(), "timePicker");
+                timePicker.show(getParentFragmentManager(), "timePicker");
             }
         });
 
@@ -384,7 +384,7 @@ public class FragmentRule extends FragmentBase {
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);
                 fragment.setTargetFragment(FragmentRule.this, REQUEST_COLOR);
-                fragment.show(getFragmentManager(), "rule:color");
+                fragment.show(getParentFragmentManager(), "rule:color");
             }
         });
 
@@ -484,7 +484,7 @@ public class FragmentRule extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "rule:accounts");
     }
@@ -547,7 +547,7 @@ public class FragmentRule extends FragmentBase {
                     etRecipient.setText(cursor.getString(0));
         } catch (Throwable ex) {
             Log.e(ex);
-            Helper.unexpectedError(getFragmentManager(), ex);
+            Helper.unexpectedError(getParentFragmentManager(), ex);
         }
     }
 
@@ -580,7 +580,7 @@ public class FragmentRule extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, args, "rule:delete");
     }
@@ -736,7 +736,7 @@ public class FragmentRule extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, rargs, "rule:get");
     }
@@ -758,7 +758,7 @@ public class FragmentRule extends FragmentBase {
         FragmentDialogAsk fragment = new FragmentDialogAsk();
         fragment.setArguments(args);
         fragment.setTargetFragment(FragmentRule.this, REQUEST_DELETE);
-        fragment.show(getFragmentManager(), "answer:delete");
+        fragment.show(getParentFragmentManager(), "answer:delete");
     }
 
     private void onActionCheck() {
@@ -779,7 +779,7 @@ public class FragmentRule extends FragmentBase {
 
             FragmentDialogCheck fragment = new FragmentDialogCheck();
             fragment.setArguments(args);
-            fragment.show(getFragmentManager(), "rule:check");
+            fragment.show(getParentFragmentManager(), "rule:check");
 
         } catch (JSONException ex) {
             Log.e(ex);
@@ -879,7 +879,7 @@ public class FragmentRule extends FragmentBase {
                     if (ex instanceof IllegalArgumentException)
                         Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                     else
-                        Helper.unexpectedError(getFragmentManager(), ex);
+                        Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, args, "rule:save");
         } catch (JSONException ex) {
@@ -1126,7 +1126,7 @@ public class FragmentRule extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentDialogCheck.this, args, "rule:execute");
                 }
@@ -1172,7 +1172,7 @@ public class FragmentRule extends FragmentBase {
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Helper.unexpectedError(getFragmentManager(), ex);
+                    Helper.unexpectedError(getParentFragmentManager(), ex);
                 }
             }.execute(this, args, "rule:check");
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java
index 5673c21671..ff4cbcbb95 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRules.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRules.java
@@ -111,7 +111,7 @@ public class FragmentRules extends FragmentBase {
                 FragmentRule fragment = new FragmentRule();
                 fragment.setArguments(args);
 
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                FragmentTransaction fragmentTransaction = getParentFragmentManager().beginTransaction();
                 fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("rule");
                 fragmentTransaction.commit();
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 4452c3c2fd..9f64578243 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -218,7 +218,7 @@ public class FragmentSetup extends FragmentBase {
         btnDoze.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                new FragmentDialogDoze().show(getFragmentManager(), "setup:doze");
+                new FragmentDialogDoze().show(getParentFragmentManager(), "setup:doze");
             }
         });
 
@@ -306,7 +306,7 @@ public class FragmentSetup extends FragmentBase {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getFragmentManager(), ex);
+                Helper.unexpectedError(getParentFragmentManager(), ex);
             }
         }.execute(this, new Bundle(), "outbox:create");
 
@@ -355,7 +355,7 @@ public class FragmentSetup extends FragmentBase {
 
                         @Override
                         protected void onException(Bundle args, Throwable ex) {
-                            Helper.unexpectedError(getFragmentManager(), ex);
+                            Helper.unexpectedError(getParentFragmentManager(), ex);
                         }
                     }.execute(FragmentSetup.this, new Bundle(), "setup:drafts");
             }