FC Barcelona star Lionel Messi will stay with the club until June 30, 2021 after agreeing to a three-year contract extension.