misc updates, bbdb integration, mail mode changes