Minor fixes and tweaks to mail source and rescanning