Re-add fixes for container that only contains special mailboxes
Fixes for expanded state