fixed persistence of messages