CRM-14367 fix on email fn