diff --git a/app/src/flux/mailsync-bridge.ts b/app/src/flux/mailsync-bridge.ts
index 66dadfdd9..cb1dda5e9 100644
--- a/app/src/flux/mailsync-bridge.ts
+++ b/app/src/flux/mailsync-bridge.ts
@@ -416,6 +416,10 @@ export default class MailsyncBridge {
         OnlineStatusStore.onSyncProcessStateReceived(modelJSONs[0]);
         continue;
       }
+      if (modelClass === 'ProcessAccountSecretsUpdated' && modelJSONs.length) {
+        KeyManager.extractAndStoreAccountSecrets(new Account(modelJSONs[0]));
+        continue;
+      }
 
       // dispatch the message to other windows
       ipcRenderer.send('mailsync-bridge-rebroadcast-to-all', msg);
diff --git a/app/src/flux/stores/account-store.ts b/app/src/flux/stores/account-store.ts
index cccf33b49..7627a1f13 100644
--- a/app/src/flux/stores/account-store.ts
+++ b/app/src/flux/stores/account-store.ts
@@ -227,7 +227,7 @@ class _AccountStore extends MailspringStore {
 
     // send the account JSON and cloud token to the KeyManager,
     // which gives us back a version with no secrets.
-    const cleanAccount = await KeyManager.extractAccountSecrets(account);
+    const cleanAccount = await KeyManager.extractAndStoreAccountSecrets(account);
 
     this._loadAccounts();
 
diff --git a/app/src/intl.ts b/app/src/intl.ts
index 1758e1e88..bda791e1c 100644
--- a/app/src/intl.ts
+++ b/app/src/intl.ts
@@ -35,7 +35,6 @@ const VERIFIED_LANGS = [
   'ko',
   'pl',
   'ja',
-  'ko',
   'zh-CN',
   'zh-TW',
   'pt',
diff --git a/app/src/key-manager.ts b/app/src/key-manager.ts
index 940a2c0ce..aef1e5c85 100644
--- a/app/src/key-manager.ts
+++ b/app/src/key-manager.ts
@@ -31,7 +31,7 @@ class KeyManager {
     }
   }
 
-  async extractAccountSecrets(account: Account) {
+  async extractAndStoreAccountSecrets(account: Account) {
     try {
       const keys = await this._getKeyHash();
       keys[`${account.emailAddress}-imap`] = account.settings.imap_password;
diff --git a/mailsync b/mailsync
index c4577574c..e079b209e 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit c4577574c6f989b639de1aa2a26c993589d63ed0
+Subproject commit e079b209eb5e23195df59a12ffbac9503320029a