Message search reworked
Merge branch 'feature/rework-message-search' into develop