Added enhanced support for Gmail and Google Plus.