Improve message creation.