Add @ as alternative keyword and support for Mailbox Beta