minor code changes in email notification module