Template - Messages is back in the template