Support both field names for mailer recipients
Support both filed names fro email-ext
Support workspace cleanup for 1.480 line
Do not wait forever for email to arrive