Gmail fix (closes #18)