I switched from iCloud Mail to Fastmail and I’m happy.