[#1846] Attempt to make message parsing faster