fixing inbox issues