I don't see it as so much of a problem. Like dangling participles, the intended meaning is normally clear enough. You could say The files that are sitting in the office and that I was talking about /about which I was talking yesterday are in disarray, but it doesn't sound like much of an improvement to me. You could also lose sitting and move in the office to the end, but again I prefer the original.
- For Teachers