diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 81b8bc85e2..a71b4c832d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4651,11 +4651,14 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             @Override
             protected void onExecuted(Bundle args, final ArrayList<MessageTarget> result) {
-                ActivityView activity = (ActivityView) getActivity();
-                if (activity == null) {
+                FragmentActivity factivity = getActivity();
+                if (!(factivity instanceof ActivityView)) {
                     Log.e("Undo: activity missing");
                     return;
                 }
+
+                ActivityView activity = (ActivityView) factivity;
+
                 View content = activity.getContentView();
                 if (content == null) {
                     Log.e("Undo: view missing");