more simplification for gmail