fix evolution of messages (hopefully)