Fix mail bug by sandeep...

Fix mail bug by sandeep...