I would modify this request: Just automatically adjust the wrap to the existing screen. Of course this depends on the font, landscape or portrait and displayed sidebar or not.

I would prefer option 1. But it would be great to have also option 2. Well, and please consider to implement the same for iDisk.