Message search

Merged better search options and other goodies.