diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java b/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java
index f9d117e1ff..c1cf9316b9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogPermissions.java
@@ -59,7 +59,7 @@ public class FragmentDialogPermissions extends FragmentDialogBase {
         tvDozeDevice.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Helper.view(context, Uri.parse(Helper.DONTKILL_URI), true);
+                Helper.view(v.getContext(), Uri.parse(Helper.DONTKILL_URI), true);
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 61ae97a9c8..eaacd71f79 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -113,6 +113,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
     private Button btnDoze;
     private TextView tvDoze12;
     private TextView tvDozeWhy;
+    private TextView tvKilling;
 
     private Button btnBackgroundRestricted;
     private Button btnDataSaver;
@@ -200,6 +201,7 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
         btnDoze = view.findViewById(R.id.btnDoze);
         tvDoze12 = view.findViewById(R.id.tvDoze12);
         tvDozeWhy = view.findViewById(R.id.tvDozeWhy);
+        tvKilling = view.findViewById(R.id.tvKilling);
 
         btnBackgroundRestricted = view.findViewById(R.id.btnBackgroundRestricted);
         btnDataSaver = view.findViewById(R.id.btnDataSaver);
@@ -588,6 +590,15 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS
             }
         });
 
+        tvKilling.setPaintFlags(tvKilling.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvKilling.setVisibility(Helper.isAggressivelyKilling() ? View.VISIBLE : View.GONE);
+        tvKilling.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.view(v.getContext(), Uri.parse(Helper.DONTKILL_URI), true);
+            }
+        });
+
         tvStamina.setPaintFlags(tvStamina.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
         tvStamina.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 222744760b..a600f9adcf 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1514,6 +1514,14 @@ public class Helper {
                 isSony());
     }
 
+    static boolean isAggressivelyKilling() {
+        return (BuildConfig.DEBUG ||
+                isSamsung() ||
+                isOnePlus() ||
+                isHuawei() ||
+                isXiaomi());
+    }
+
     static boolean isAndroid12() {
         return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
     }
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 91cd9a37c2..cd1ec30fa5 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -796,6 +796,21 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvDozeHint" />
 
+                <TextView
+                    android:id="@+id/tvKilling"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_setup_doze_aggressively"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?attr/colorWarning"
+                    android:textStyle="bold"
+                    app:drawableTint="?attr/colorWarning"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvDozeWhy" />
+
                 <TextView
                     android:id="@+id/tvBackgroundRestricted"
                     android:layout_width="wrap_content"
@@ -809,7 +824,7 @@
                     android:textStyle="bold"
                     app:drawableTint="?attr/colorWarning"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvDozeWhy" />
+                    app:layout_constraintTop_toBottomOf="@id/tvKilling" />
 
                 <Button
                     android:id="@+id/btnBackgroundRestricted"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 715d4dcc01..5cf7e0e0a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,6 +262,7 @@
     <string name="title_setup_doze_remark">To send and receive email reliably in the background</string>
     <string name="title_setup_doze_explanation">Battery optimizations should be disabled for the app to ensure reliable sending and receiving of messages in the background</string>
     <string name="title_setup_doze_hint">Although this may sound contradictory, turning off battery optimizations for this app will result in less battery usage</string>
+    <string name="title_setup_doze_aggressively">This device could aggressively stop apps</string>
     <string name="title_setup_doze_why">Why should battery optimizations be disabled?</string>
     <string name="title_setup_doze_instructions">In the next Android dialog change "Not optimized" to "All apps", select this app and select "Don\'t optimize"</string>
     <string name="title_setup_doze_battery">High battery usage?</string>