updated mail Message
updated mail sender code
updated test
updated grammar