Committing gmail and hotmail. Additional missed refactor for Issue #152