#commit : finishing email module implementation