fixup: hangle googlemail case