Changes to support Bulk e-mail usage.