Enrique’s injury list shortened as Messi returns to action