used EmailMessage template
updated e-mail message
small fixes