diff --git a/jslib b/jslib
index 27566c3fd5..3b22df15e8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 27566c3fd5a1040112278c7ad0a50c6b8d45e3e4
+Subproject commit 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index f259a971e6..eb90c02d55 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -546,12 +546,15 @@
   "exportVault": {
     "message": "Export Vault"
   },
+  "fileFormat": {
+    "message": "File Format"
+  },
   "warning": {
     "message": "WARNING",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
-  "exportWarning": {
-    "message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after you are done using it."
+  "exportWarningDesc": {
+    "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
   },
   "exportMasterPassword": {
     "message": "Enter your master password to export your vault data."
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index d3a87858ec..850021759e 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -16,6 +16,13 @@
     <content>
         <div class="box">
             <div class="box-content">
+                <div class="box-content-row" appBoxRow>
+                    <label for="format">{{'fileFormat' | i18n}}</label>
+                    <select id="format" name="Format" [(ngModel)]="format">
+                        <option value="json">.json</option>
+                        <option value="csv">.csv</option>
+                    </select>
+                </div>
                 <div class="box-content-row box-content-row-flex" appBoxRow>
                     <div class="row-main">
                         <label for="masterPassword">{{'masterPass' | i18n}}</label>
@@ -33,7 +40,7 @@
             </div>
             <div class="box-footer">
                 <p>{{'exportMasterPassword' | i18n}}</p>
-                <strong>{{'warning' | i18n}}</strong>: {{'exportWarning' | i18n}}
+                <strong>{{'warning' | i18n}}</strong>: {{'exportWarningDesc' | i18n}}
             </div>
         </div>
     </content>