+ issue #130: update for mail template types.