Bug 845069 - Email Search Updates
Merge pull request #8558 from pivanov/bug-845069

Bug 845069 - Email Search Updates