Adding support for GMail