I think they still wore uniforms in OoTP movie too, if I remember correctly. And in one of the books Malfoy docked points for someone having an untucked shirt. But yeah there's evidence for both ways.

Ehehehe nice save, Legion :D