updated according to gmail platform