This fixes bug 18059.  If this one is not acceptable, feel free to take it and clean it up, I am abandoning this effort from here forward.

---

Windows Live: Keep your friends up to date with what you do online. Find out more.