refactor of emailsupport