Fix WIP 235 - Message Search
Merge pull request #100 from austinylin/master

Fix WIP 235 - Message Search