diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index 23461fe090..abda0941e0 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -229,7 +229,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 0212f96ae0..a224ec694e 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -236,7 +236,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index c3d77cac15..d16e93595b 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -235,7 +235,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 0236bc6bdf..51ae43bfb2 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -235,7 +235,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 545d9f6011..9cd0fbdcbc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -231,7 +231,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 05b04224e4..3b36fe51d9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -19,8 +19,10 @@ package eu.faircode.email;
     Copyright 2018-2024 by Marcel Bokhorst (M66B)
 */
 
+import android.app.Notification;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -61,6 +63,7 @@ import com.google.android.material.tabs.TabLayout;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 public class FragmentOptions extends FragmentBase {
     private ViewPager pager;
@@ -274,12 +277,21 @@ public class FragmentOptions extends FragmentBase {
                     .setText(title);
         }
 
-        String tab = getActivity().getIntent().getStringExtra("tab");
-        if (!TextUtils.isEmpty(tab)) {
-            int index = TAB_LABELS.indexOf(tab);
-            if (index >= 0)
-                pager.setCurrentItem(index);
-            getActivity().getIntent().removeExtra("tab");
+        Intent intent = getActivity().getIntent();
+        if (intent != null) {
+            String tab;
+
+            Set<String> categories = intent.getCategories();
+            if (categories != null && categories.contains(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES))
+                tab = "notifications";
+            else
+                tab = getActivity().getIntent().getStringExtra("tab");
+            if (!TextUtils.isEmpty(tab)) {
+                int index = TAB_LABELS.indexOf(tab);
+                if (index >= 0)
+                    pager.setCurrentItem(index);
+                getActivity().getIntent().removeExtra("tab");
+            }
         }
     }
 
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 1aa01d42c8..3a72880f4f 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -229,7 +229,12 @@
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain"
             android:resizeableActivity="true"
-            android:taskAffinity="${applicationId}.SETUP" />
+            android:taskAffinity="${applicationId}.SETUP">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".ActivitySignature"