Another patch of email sharing code