Internal updates to mailTemplate component