Add option to remove e-mail addresses (2)