Fixes for gmail
Migrating to NativeMessaging