Messi led Argentina to their third world cup title in Qatar back in December and indicated almost immediately that he intended to continue with his international career for a while longer.
The 35-year-old has been with the national team since 2005 and is now a veteran of 178 caps and 98 goals.
While in Qatar, Messi hinted he could be playing in his last World Cup but Scaloni, who has signed on until the end of the next tournament in USA, Canada and Mexico, is still looking to count on the Paris Saint Germain superstar.
Scaloni has included Messi in the Argentina squad for upcoming friendly matches against Panama and Curacao.
"Messi will continue to come until he says otherwise. I see him happy on the pitch and within the selection," Scaloni said at a press conference on Tuesday.
"Leo's looking good to me. He deserves all that love. He and all the players who are here deserve to go out and receive that love because they have not been able to live it.
"Leo, although he is the best of all, he also needs to see that his people love him. This is something that will stay with him forever."
