diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index afacf0c895..9b537e6f58 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2466,16 +2466,22 @@ public class FragmentCompose extends FragmentBase {
 
         @Override
         protected void onPreExecute(Bundle args) {
-            busy = true;
-            Helper.setViewsEnabled(view, false);
-            getActivity().invalidateOptionsMenu();
+            int action = args.getInt("action");
+            if (action != R.id.action_check) {
+                busy = true;
+                Helper.setViewsEnabled(view, false);
+                getActivity().invalidateOptionsMenu();
+            }
         }
 
         @Override
         protected void onPostExecute(Bundle args) {
-            busy = false;
-            Helper.setViewsEnabled(view, true);
-            getActivity().invalidateOptionsMenu();
+            int action = args.getInt("action");
+            if (action != R.id.action_check) {
+                busy = false;
+                Helper.setViewsEnabled(view, true);
+                getActivity().invalidateOptionsMenu();
+            }
         }
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogEx.java b/app/src/main/java/eu/faircode/email/FragmentDialogEx.java
index 8a3c1f6267..7a8f2dec46 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogEx.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogEx.java
@@ -82,7 +82,6 @@ public class FragmentDialogEx extends DialogFragment {
                 " request=" + requestCode + " result=" + resultCode);
         Log.logExtras(data);
         super.onActivityResult(requestCode, resultCode, data);
-
     }
 
     @NonNull