[Settings] - fixed headers
Merge pull request #7464 from pivanov/bug-815608

Bug 815608 - [Settings] - fixed headers
Bug 827333 - [email/activesync] Hide the "no mail in thie folder" alert when we're waiting to get the real inbox; r=asuth, a=blocking-basecamp
Merge pull request #7409 from mozsquib/email-as-fake-inbox-loading

Bug 827333 - Don't show the empty folder message when we're waiting to get the real ActiveSync inbox
Auto-merge from branch 'master'