Recursively parse inserttags and simple tokens in mail templates (#646)
Restore basic entities in mail templates (#646)