Revert "Revert "* Added the missing functionality for email notification""

This reverts commit 004b5e9dc2ed4381f514f3950706a5f9a6e4b723.
Revert "Revert "Revert "* Added the missing functionality for email notification"""

This reverts commit da9af0e589a0d6d6694195c9668f71142d9f40e0.