Improve mail search

Stump! We have a paper protoype