Email Feature now Working