Always re-encrypt if requested
Fix creation of new files