Messi to remain at Barcelona until 2021 after agreeing new deal