Bug 800402 - [email] UI: Show the number of unread messages in the message-list header after the folder name
Put in new gelam changes, and clean up in adjustHeaderMargins