+ Added regex support to match email address and subject