diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index eab0117cd3..ddbf690c10 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -79,6 +79,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
         final TextView tvDuration = dview.findViewById(R.id.tvDuration);
         final TimePicker timePicker = dview.findViewById(R.id.timePicker);
         final DatePicker datePicker = dview.findViewById(R.id.datePicker);
+        final TextView tvSnoozeDoze = dview.findViewById(R.id.tvSnoozeDoze);
 
         final int colorWarning = Helper.resolveColor(context, R.attr.colorWarning);
         final int textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
@@ -109,6 +110,16 @@ public class FragmentDialogDuration extends FragmentDialogBase {
             timePicker.setMinute(cal.get(Calendar.MINUTE));
         }
 
+        boolean isIgnoring = !Boolean.FALSE.equals(Helper.isIgnoringOptimizations(context));
+        tvSnoozeDoze.setVisibility(isIgnoring ? View.GONE : View.VISIBLE);
+        tvSnoozeDoze.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                v.getContext().startActivity(new Intent(v.getContext(), ActivitySetup.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK));
+            }
+        });
+
         Dialog dialog = new AlertDialog.Builder(context)
                 .setIcon(R.drawable.twotone_timelapse_24)
                 .setTitle(title)
diff --git a/app/src/main/res/layout/dialog_duration.xml b/app/src/main/res/layout/dialog_duration.xml
index 151c67cddc..12dfeb44ad 100644
--- a/app/src/main/res/layout/dialog_duration.xml
+++ b/app/src/main/res/layout/dialog_duration.xml
@@ -73,5 +73,19 @@
             app:layout_constraintHeight_max="180dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/timePicker" />
+
+        <TextView
+            android:id="@+id/tvSnoozeDoze"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:drawableEnd="@drawable/twotone_settings_24"
+            android:drawablePadding="6dp"
+            android:text="@string/title_snooze_doze"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/datePicker" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa9366f6fa..84340740a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2446,6 +2446,7 @@
     <string name="title_via">Via: %1$s</string>
     <string name="title_1hour">1 hour</string>
     <string name="title_1day">1 day</string>
+    <string name="title_snooze_doze">Please disable battery optimizations via step 3 of the main settings screen</string>
     <string name="title_more_overflow">More &#8230;</string>
     <string name="title_today_at">Today at %1$s</string>
     <string name="title_tomorrow_at">Tomorrow at %1$s</string>