fix(message): fix message parsing implementation

It was pretty broken before. Yeah.