diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 21d8ab5a2a..3b857c80e6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -752,7 +752,7 @@ public class FragmentCompose extends FragmentEx {
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        try {
+                        if (Helper.isPro(getContext())) {
                             int hours = npHours.getValue();
                             int days = npDays.getValue();
                             long duration = (hours + days * 24) * HOUR_MS;
@@ -784,8 +784,10 @@ public class FragmentCompose extends FragmentEx {
                                     Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
                                 }
                             }.execute(FragmentCompose.this, args, "compose:send:after");
-                        } catch (Throwable ex) {
-                            Log.e(ex);
+                        } else {
+                            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                            fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+                            fragmentTransaction.commit();
                         }
                     }
                 })
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c981d3f6e5..49e6b6fc3d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1237,7 +1237,7 @@ public class FragmentMessages extends FragmentEx {
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                try {
+                                if (Helper.isPro(getContext())) {
                                     int hours = npHours.getValue();
                                     int days = npDays.getValue();
                                     long duration = (hours + days * 24) * HOUR_MS;
@@ -1276,8 +1276,10 @@ public class FragmentMessages extends FragmentEx {
                                             Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
                                         }
                                     }.execute(FragmentMessages.this, args, "messages:snooze");
-                                } catch (Throwable ex) {
-                                    Log.e(ex);
+                                } else {
+                                    FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                                    fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro");
+                                    fragmentTransaction.commit();
                                 }
                             }
                         })