Merge branch 'messageSearchWith0.70+' into 'master'

fixes messagesearch fot 0.70+

See merge request !212
1 job for master in 2 minutes and 2 seconds (queued for 3 seconds)