Avoid premature index access from mail sources
Make rescan by default ignore sources (they scan themselves)
Reduce verbosity a bit (less debugging)