Fix WIP 235 - Message Search

Fixes https://assemblymade.com/helpful/wips/235