Corrupted DOCX Template Upload – Temporary Workaround, Better Solution?

Thanks Nikita,
In 1.5 and 1.6 we are facing similar problem.
When downloading the DOCX template to change something (even layout stuf), after upload of the changed version, the new generated DOCX file contains some “unreadable” content according Word.
I suppose it is due to the corrupted template.