Bug 845062 - Email Search Box Updates
Merge pull request #8556 from pivanov/bug-845062

Bug 845062 - Email Search Box Updates