diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9530043193e06d75ffff92303e95d5e7b9700528..c379c6af33ba43df1058b9bca6b26b47e567e1f6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,12 @@
     <permission android:name="foundation.e.accountmanager.permission.ADD_ACCOUNT"
         android:protectionLevel="signature" />
 
+    <!-- permission for broadcast related to account changes event (added/removed) -->
+    <permission
+        android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
+        android:protectionLevel="signature"/>
+    <uses-permission android:name="foundation.e.accountmanager.permission.ACCOUNT_EVENTS"/>
+
     <!-- android.permission-group.LOCATION -->
     <!-- getting the WiFi name (for "sync in Wifi only") requires
       - coarse location (Android 8.1)
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt b/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
index 07675e657ce8d0a72945aafd146c1ef80be2c20c..2a84249a125f7dd67b382094fdc4198bc0815aa9 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt
@@ -26,11 +26,19 @@ object MailAccountSyncHelper {
     private const val MAIL_PACKAGE = "foundation.e.mail"
     private const val MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver"
     private const val ACTION_PREFIX = "foundation.e.accountmanager.account."
+    private const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS"
 
     fun syncMailAccounts(applicationContext: Context?) {
         val intent = getIntent()
         intent.action = ACTION_PREFIX + "create"
-        applicationContext?.sendBroadcast(intent)
+        applicationContext?.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
+    }
+
+    fun notifyAccountRemoved(context: Context, accountRemovedIntent: Intent) {
+        val intent = getIntent()
+        intent.action = ACTION_PREFIX + "removed"
+        intent.putExtras(accountRemovedIntent)
+        context.sendBroadcast(intent, ACCOUNT_EVENTS_PERMISSION)
     }
 
     private fun getIntent() : Intent {
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
index 7409c058da21d434203d35a4fbeacb3d433c14c1..5ca9c8fb66b3f7bac94a325da5650e0a37fc2ce9 100644
--- a/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
+++ b/app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt
@@ -20,6 +20,7 @@ import android.accounts.AccountManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import at.bitfire.davdroid.MailAccountSyncHelper
 import at.bitfire.davdroid.settings.AccountSettings
 import at.bitfire.davdroid.syncadapter.AccountUtils
 import at.bitfire.davdroid.ui.signout.OpenIdEndSessionActivity
@@ -43,6 +44,7 @@ class AccountRemovedReceiver : BroadcastReceiver() {
             context = context,
             accountName = accountName
         )
+        MailAccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)
     }
 
     private fun clearOidcSession(