Jean-Francois, the only "trick" to reported speech is that sometimes the tense shifts back. It doesn't have to if the essential truth of the issue is still true, but it's never wrong to shift it back either. You can use the "that" - you are inconsistent in using...