GMAIL Common Fixes