add uid to messages
fixes