added support for multipe email types

(supposedly....)