more message stuff

I should stop with those hashamps :/