diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index aae461772e..8fe8e3d7e1 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -436,7 +436,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                     prefs.edit().putBoolean("biometrics", !biometrics).apply();
 
                 ToastEx.makeText(ActivitySetup.this,
-                        pro ? R.string.title_setup_done : R.string.title_pro_feature,
+                        pro
+                                ? biometrics
+                                ? R.string.title_setup_biometrics_disable
+                                : R.string.title_setup_biometrics_enable
+                                : R.string.title_pro_feature,
                         Toast.LENGTH_LONG).show();
             }
         }, new Runnable() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 7a83f3f63b..53b10d5132 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -33,6 +33,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -531,6 +532,16 @@ public class FragmentFolders extends FragmentBase {
         args.putBoolean("browsed", browsed);
 
         new SimpleTask<Void>() {
+            @Override
+            protected void onPreExecute(Bundle args) {
+                ToastEx.makeText(getContext(), R.string.title_executing, Toast.LENGTH_LONG).show();
+            }
+
+            @Override
+            protected void onPostExecute(Bundle args) {
+                ToastEx.makeText(getContext(), R.string.title_completed, Toast.LENGTH_LONG).show();
+            }
+
             @Override
             protected Void onExecute(Context context, Bundle args) {
                 long id = args.getLong("id");
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b37e37ccf7..66baaf94ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -742,6 +742,8 @@
     <string name="title_report">Report</string>
     <string name="title_fix">Fix</string>
     <string name="title_enable">Enable</string>
+    <string name="title_executing">Executing</string>
+    <string name="title_completed">Completed</string>
     <string name="title_ask_what">Ask what to do</string>
     <string name="title_no_ask_again">Do not ask this again</string>
     <string name="title_no_body">No message text found</string>