Comment 2 for bug 952533

1. I was already working on this for another bug
2, 3 Could probably reuse the same code as 1
4. It didn't crash on new line because I fixed that already (Went in to trunk last saturday)

I'll take a crack at this, not sure if I'll get it in before 1.9.9, so if somebody wants to take this on for 1.9.9 please feel free.