DNN-4755 Allow for more tokens in CoreMessaging E-Mails