Fix for latest gmail