Fixing inbox issues