*8212* Email template refactoring