Improved minor updates to gmail module