fixes in message-plugin