Fixing inbox selection