Fix Mail templates
Merge pull request #34 from MilloLab/0.5

Fix Mail templates