Adding mail confirmation feature