diff --git a/www/form/export.js b/www/form/export.js
new file mode 100644
index 000000000..e29c6dd87
--- /dev/null
+++ b/www/form/export.js
@@ -0,0 +1,60 @@
+define([
+    '/common/common-util.js',
+    '/customize/messages.js'
+], function (Util, Messages) {
+    var Export = {};
+
+    var escapeCSV = function (v) {
+        if (!/("|,)/.test(v)) {
+            return v || '';
+        }
+        var value = '';
+        var vv = (v || '').replaceAll('"', '""');
+        value += '"' + vv + '"';
+        return value;
+    };
+    Export.results = function (content, answers, TYPES) {
+        console.log(content, answers, TYPES);
+        if (!content || !content.form) { return; }
+        var csv = "";
+        var form = content.form;
+
+        var questions = Object.keys(form).map(function (key) {
+            var obj = form[key];
+            if (!obj) { return; }
+            return obj.q || Messages.form_default;
+        }).filter(Boolean);
+        questions.unshift(Messages.form_poll_time); // "Time"
+        questions.unshift(Messages.share_formView); // "Participant"
+
+        questions.forEach(function (v, i) {
+            if (i) { csv += ','; }
+            csv += escapeCSV(v);
+        });
+
+        Object.keys(answers || {}).forEach(function (key) {
+            var obj = answers[key];
+            csv += '\n';
+            var time = new Date(obj.time).toISOString();
+            var msg = obj.msg || {};
+            var user = msg._userdata;
+            csv += escapeCSV(time);
+            csv += ',' + escapeCSV(user.name || Messages.anonymous);
+            Object.keys(form).forEach(function (key) {
+                csv += ',' + escapeCSV(String(msg[key]));
+            });
+        });
+        console.log(csv);
+        return csv;
+    };
+
+    Export.main = function (content, cb) {
+        var json = Util.clone(content || {});
+        delete json.answers;
+        cb(new Blob([JSON.stringify(json, 0, 2)], {
+            type: 'application/json;charset=utf-8'
+        }));
+    };
+
+    return Export;
+});
diff --git a/www/form/inner.js b/www/form/inner.js
index 80c50a0d6..123e86d5b 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4,6 +4,7 @@ define([
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/sframe-app-framework.js',
     '/common/toolbar.js',
+    '/form/export.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
     '/common/common-util.js',
@@ -30,6 +31,8 @@ define([
     'cm/mode/gfm/gfm',
     'css!cm/lib/codemirror.css',
 
+    '/bower_components/file-saver/FileSaver.min.js',
+
     'css!/bower_components/codemirror/lib/codemirror.css',
     'css!/bower_components/codemirror/addon/dialog/dialog.css',
     'css!/bower_components/codemirror/addon/fold/foldgutter.css',
@@ -42,6 +45,7 @@ define([
     Crypto,
     Framework,
     Toolbar,
+    Exporter,
     nThen,
     SFCommon,
     Util,
@@ -1656,9 +1660,22 @@ define([
 
         var controls = h('div.cp-form-creator-results-controls');
         var $controls = $(controls).appendTo($container);
+        Messages.form_exportCSV = "Export results as CSV";
+        var exportButton = h('button.btn.btn-secondary', Messages.form_exportCSV);
+        var exportCSV = h('div.cp-form-creator-results-export', exportButton);
+        $(exportCSV).appendTo($container);
         var results = h('div.cp-form-creator-results-content');
         var $results = $(results).appendTo($container);
 
+        $(exportButton).click(function () {
+            var csv = Exporter.results(content, answers, TYPES);
+            if (!csv) { return void UI.warn(Messages.error); }
+            var suggestion = APP.framework._.title.suggestTitle('cryptpad-document');
+            var title = Util.fixFileName(suggestion) + '.csv';
+            window.saveAs(new Blob([csv], {
+                type: 'text/csv'
+            }), title);
+        });
 
         var summary = true;
         var form = content.form;
@@ -2315,6 +2332,7 @@ define([
 
     var andThen = function (framework) {
         framework.start();
+        APP.framework = framework;
         var evOnChange = Util.mkEvent();
         var content = {};
 
@@ -2739,6 +2757,17 @@ define([
             return content;
         });
 
+        framework.setFileImporter({ accept: ['.json'] }, function (newContent) {
+            var parsed = JSON.parse(newContent || {});
+            parsed.answers = content.answers;
+            return parsed;
+        });
+
+        framework.setFileExporter(['.json'], function(cb, ext) {
+            Exporter.main(content, cb, ext);
+        }, true);
+
+
     };
 
     Framework.create({