Thanks, if I'm honest I had skimmed over that setting before, not understanding its purpose. (It also looks like they're now introducing a unified inbox, which is what I wanted.)