Messages and sidebar fix