cleaning up the mail config code and accomodating QuickHeal changes along with the existing GMAIL config.
Merge branch 'work_branch'