!READY TO MERGE! | MailPriority is now optional