Added better mail validation tracking