Messi and Bartomeu shake hands on new deal