Fix TODO: messageState param not needed anymore