CRM-15278 - Email signature fixes