add automatic email expansion