Further work on Messages.