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 9b1d30494a3a4b067b485b3d2315df5714c4a96d..45e907e787566fd6c9165be5474c9b83d971dd90 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
@@ -87,14 +87,12 @@ class AccountSyncReceiver : BroadcastReceiver(), KoinComponent {
             return null
         }
 
-        val account = intent.extras?.getString(AccountManager.KEY_ACCOUNT_NAME) ?: return null
+        val accountName = intent.extras?.getString(AccountManager.KEY_ACCOUNT_NAME) ?: return null
 
-        preferences.accounts.forEach {
-            if (it.email == account) {
-                return it
+        return preferences.accounts
+            // To compare, sanitize `user.name@example.com` to `user.name` only.
+            .firstOrNull { account ->
+                account.email.substringBefore("@") == accountName.substringBefore("@")
             }
         }
-
-        return null
-    }
 }