updated mail tokens