fix #6 - some improvements
fix #6 - mail template fixing