Add a basic Message-Id management and improve the client