Fix email notification logic. Add support for additional auto-responder fields.