few changes in email module