Bug 800402 - [email] UI: Show the number of unread messages in the message-list header after the folder name

Er, and in general you should feel free to opportunistically try and clean up comments when you touch them (or just do general clean-up in a separate pull request).  But there's no requirement to clean the existing comments up in general.