Bug 824783 - Don't show the "empty folder" and "loading" indicators at the same time; r=asuth, a=blocking-basecamp
Merge pull request #7245 from mozsquib/email-as-fake-inbox

Bug 824783 - Don't show the "empty folder" and "loading" indicators at the same time
Auto-merge from branch 'master'