Some additional message index clean-up

Unless all this code has a purpose I do not know it's redundant. There is no any visible difference in the browsers before and after the changes.

Signed-off-by: Hristo- <Hristo-@users.noreply.github.com>