Thank you for your amendments, guys.
My manual says that there is a method using which it is in practice easier to define whether a Future tense must be used:
if "when" means "when exactly", i.e. a month, day, hour etc., and the logical accent can be made on "when", then a Future tense is...