diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 52535828a6..cd6d0b5637 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -127,7 +127,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
                     protected void onException(Bundle args, Throwable ex) {
                         Helper.unexpectedError(context, owner, ex);
                     }
-                }.execute(context, owner, args);
+                }.execute(context, owner, args, "operation:open:folder");
             } else {
                 Bundle args = new Bundle();
                 args.putLong("id", operation.message);
@@ -153,7 +153,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
                     protected void onException(Bundle args, Throwable ex) {
                         Helper.unexpectedError(context, owner, ex);
                     }
-                }.execute(context, owner, args);
+                }.execute(context, owner, args, "operation:open:message");
             }
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 1953a29e0e..a6f43cdb67 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -486,7 +486,7 @@ public class FragmentSetup extends FragmentEx {
                             grpQuickError.setVisibility(View.VISIBLE);
                         }
                     }
-                }.execute(FragmentSetup.this, args);
+                }.execute(FragmentSetup.this, args, "setup:quick");
             }
         });
 
@@ -665,7 +665,7 @@ public class FragmentSetup extends FragmentEx {
             protected void onException(Bundle args, Throwable ex) {
                 Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
             }
-        }.execute(this, new Bundle());
+        }.execute(this, new Bundle(), "outbox:create");
 
         return view;
     }
@@ -834,7 +834,7 @@ public class FragmentSetup extends FragmentEx {
                 protected void onException(Bundle args, Throwable ex) {
                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
                 }
-            }.execute(FragmentSetup.this, new Bundle());
+            }.execute(FragmentSetup.this, new Bundle(), "setup:sync");
     }
 
     @Override
@@ -1107,7 +1107,7 @@ public class FragmentSetup extends FragmentEx {
                 else
                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
             }
-        }.execute(this, args);
+        }.execute(this, args, "setup:export");
     }
 
     private void handleImport(Intent data, String password) {
@@ -1253,7 +1253,7 @@ public class FragmentSetup extends FragmentEx {
                 else
                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
             }
-        }.execute(this, args);
+        }.execute(this, args, "setup:import");
     }
 
     private void selectAccount() {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index d2f0231386..6290e778a0 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -272,7 +272,7 @@ public class Helper {
                                     else
                                         Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
                                 }
-                            }.execute(context, owner, new Bundle());
+                            }.execute(context, owner, new Bundle(), "error:unexpected");
                         }
                     })
                     .show();