Some cleaning up of the message index
Signed-off-by: Hristo- <Hristo-@users.noreply.github.com>