This also increases accuracy as to when specific mail is allowed, and correctly handles masking of the 0xCDD1 mails.