However, not all data will be encrypted in this way. Notably, calendar and mail data will not be affected by this change. Apple says that these data categories are not covered “because of the need to interoperate with the global email, contacts, and calendar systems.”

US-based participants in the Apple Beta Software Program can start using Advanced Data Protection today, and the feature will roll out to more Americans by the end of the year. If you’re outside the US, you’ll have to wait until 2023 to use the feature, according to Apple.

Advanced Data Protection is the main focus of today’s announcement, but Apple also revealed two other privacy and security features related to iCloud. First, iCloud users can now use hardware security keys like YubiKeys. Both NFC keys and plug-in keys are supported.

Second, there is a new feature called iMessage Contact Key Verification that can alert high-risk users, such as journalists, if their conversations are being hijacked or monitored by state-sponsored actors.

Apple also confirmed that it is no longer working on a controversial system that was designed to identify child sexual-abuse material on users’ iPhones. The company changed its plans after facing significant public backlash over privacy and security concerns.