New email and a better way of handeling the validation of message keys