Fixing message search see BT#7851