smarter handling of message data