Barcelona must tie down Lionel Messi, as it'll be a 'historical mistake' if the La Liga champions do not renew the Argentine's contract, says Xavi.
Messi's current deal at the Camp Nou expires in 2018 and Xavi cannot see the 29-year-old leaving the Catalan club.
The Barca legend told TV3: "I am convinced Messi will sign a new deal. Barcelona need Messi, but Messi also needs Barcelona.
"He looks happy to me, more mature and calm than ever before. I cannot see him changing clubs, but we have to act swiftly.
"It would be a historical mistake for Barcelona not to renew Messi's contract.
"Leo is the best player in history. His importance will become even more clear once he retires."