diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index c2e1f5acfdfa28f0f0d2110c72c3ff7d6ca22634..55baaa04b298a768ee44d6a29de224ba54a485bb 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -25,6 +25,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
 
+    <uses-permission android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"/>
+
     <application
         android:name="com.fsck.k9.App"
         android:allowTaskReparenting="false"
@@ -322,12 +324,14 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".account.AccountSyncReceiver"
+        <receiver
+            android:name=".account.AccountSyncReceiver"
+            android:exported="true"
             android:enabled="true"
-            android:exported="true">
+            android:permission="foundation.e.accountmanager.permission.ACCOUNT_EVENTS">
             <intent-filter>
                 <action android:name="foundation.e.accountmanager.account.create"/>
-                <action android:name="android.accounts.action.ACCOUNT_REMOVED"/>
+                <action android:name="foundation.e.accountmanager.account.removed"/>
             </intent-filter>
         </receiver>
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt
index 25f016024ca3465ff15d34046f5b8e0362a5e849..7a9d78a898d9c654015a495b891eebc447809b3a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt
@@ -37,7 +37,7 @@ class AccountSyncReceiver : BroadcastReceiver(), KoinComponent {
         private const val ACTION_PREFIX = "foundation.e.accountmanager.account"
 
         private const val ACCOUNT_CREATION_ACTION = "$ACTION_PREFIX.create"
-        private const val ACCOUNT_REMOVAL_ACTION = "android.accounts.action.ACCOUNT_REMOVED"
+        private const val ACCOUNT_REMOVAL_ACTION = "$ACTION_PREFIX.removed"
 
     }