Further fixes for bulk emailer.