Bug 845069 - Email Search Updates