diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 569ff30e23..d29b0825c5 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -669,6 +669,8 @@ public class ActivityEML extends ActivityBase {
             @Override
             protected void onExecuted(Bundle args, String name) {
                 ToastEx.makeText(ActivityEML.this, name, Toast.LENGTH_LONG).show();
+                if (BuildConfig.DEBUG)
+                    finish();
             }
 
             @Override