Add support for e-mail groups