edit messages

Resolves #706