Made fixes to send notification mail