grammaticality - The future as reported in the past

Is (1) correct, or must it be written as (2)?

1. John told me yesterday that this contract will not be renewed when it ends next month.


2. John told me yesterday that this contract would not be renewed. It would be ending next month.