This can be handled via an small change to the query.edit.html template. I've checked in an updated version to CVS. You can now toggle to/from "Private to you" providing the "Expected behavior" described above.