Working on mail system - added search, better controls etc
Merge branch 'mail-updates'