diff --git a/src/translation/en.json b/src/translation/en.json
index 501a30af9..462d35a31 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -355,7 +355,7 @@
             "title": "Import Users",
             "fileInput": "Select JSON or CSV file",
             "importAction": "Import",
-            "description": "The import requires a specific schema for both JSON and CSV. The detailed schema is described in our <a href=\"{{ docsLink }}\" target=\"_blank\">documentation</a>.",
+            "description": "Upload a JSON or CSV file with the schema described in our <a href=\"{{ docsLink }}\" target=\"_blank\">documentation</a>",
             "usersFound": "Found {{ count }} user(s) to import.",
             "success": "{{ count }} user(s) imported.",
             "failed": "The following users were not imported:",
@@ -1292,10 +1292,10 @@
         "howToConnectInfoModal": "Configuring Email Clients",
         "mailboxImportDialog": {
             "title": "Import Mailboxes",
-            "description": "The import requires a specific schema for JSON. The detailed schema is described in our <a href=\"{{ docsLink }}\" target=\"_blank\">documentation</a>",
-            "fileInput": "Select JSON file",
-            "mailboxesFound": "Found {{ count }} mailboxes to import",
-            "success": "{{ count }} mailboxes successfully imported.",
+            "description": "Upload a JSON or CSV file with the schema described in our <a href=\"{{ docsLink }}\" target=\"_blank\">documentation</a>.",
+            "fileInput": "Select JSON or CSV file",
+            "mailboxesFound": "Found {{ count }} mailbox(es) to import",
+            "success": "{{ count }} mailbox(es) imported.",
             "failed": "The following mailboxes were not imported:",
             "importAction": "Import"
         }
diff --git a/src/views/email.html b/src/views/email.html
index 921a2bf71..9a212c831 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -209,13 +209,13 @@
       <div class="modal-body">
         <div ng-show="!mailboxImport.done">
           <div ng-show="!mailboxImport.busy">
-            <p ng-bind-html=" 'email.mailboxImportDialog.description' | tr:{ docsLink: 'https://cloudron.io/documentation/email/#import' } "></p>
-            <input type="file" style="display: none;" id="mailboxImportFileInput" accept="application/json"/>
+            <p ng-bind-html=" 'email.mailboxImportDialog.description' | tr:{ docsLink: 'https://cloudron.io/documentation/email/#import-mailboxes' } "></p>
+            <input type="file" style="display: none;" id="mailboxImportFileInput" accept="application/json,text/csv"/>
             <button class="btn btn-primary" ng-click="mailboxImport.openFileInput()">{{ 'email.mailboxImportDialog.fileInput' | tr }}</button>
             <br/>
             <br/>
             <p class="text-danger" ng-show="mailboxImport.error.file">{{ mailboxImport.error.file }}</p>
-            <p ng-show="mailboxImport.mailboxes.length">{{ 'email.mailboxImportDialog.mailboxesFound' | tr:{ count: mailboxImport.mailboxes.length } }}</p>
+            <p class="text-info" ng-show="mailboxImport.mailboxes.length">{{ 'email.mailboxImportDialog.mailboxesFound' | tr:{ count: mailboxImport.mailboxes.length } }}</p>
           </div>
           <div ng-show="mailboxImport.busy" class="progress progress-striped active">
             <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ mailboxImport.percent }}%"></div>
diff --git a/src/views/email.js b/src/views/email.js
index f6149a4f4..8984aa4a6 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -377,24 +377,50 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             if (!fileInput.files || !fileInput.files[0]) return;
 
             var file = fileInput.files[0];
-            if (file.type !== 'application/json') return console.log('Unsupported file type.');
+            if (file.type !== 'application/json' && file.type !== 'text/csv') return console.log('Unsupported file type.');
 
             const reader = new FileReader();
             reader.addEventListener('load', function () {
                 $scope.$apply(function () {
-                    try {
-                        $scope.mailboxImport.mailboxes = JSON.parse(reader.result);
-                    } catch (e) {
-                        console.error('Failed to parse mailboxes.', e);
-                        $scope.mailboxImport.error = { file: 'Imported file is not valid JSON' };
+                    $scope.mailboxImport.mailboxes = [];
+                    var mailboxes = [];
+
+                    if (file.type === 'text/csv') {
+                        var lines = reader.result.split('\n');
+                        if (lines.length === 0) return $scope.mailboxImport.error = { file: 'Imported file has no lines' };
+
+                        for (var i = 0; i < lines.length; i++) {
+                            var line = lines[i].trim();
+                            if (!line) continue;
+                            var items = line.split(',');
+                            if (items.length !== 4) {
+                                $scope.mailboxImport.error = { file: 'Line ' + (i+1) + ' has wrong column count. Expecting 4' };
+                                return;
+                            }
+                            mailboxes.push({
+                                name: items[0].trim(),
+                                domain: items[1].trim(),
+                                owner: items[2].trim(),
+                                ownerType: items[3].trim(),
+                            });
+                        }
+                    } else {
+                        try {
+                            mailboxes = JSON.parse(reader.result).map(function (mailbox) {
+                                return {
+                                    name: mailbox.name,
+                                    domain: mailbox.domain,
+                                    owner: mailbox.owner,
+                                    ownerType: mailbox.ownerType
+                                };
+                            });
+                        } catch (e) {
+                            console.error('Failed to parse mailboxes.', e);
+                            $scope.mailboxImport.error = { file: 'Imported file is not valid JSON' };
+                        }
                     }
 
-                    // TODO check for validity and minium requirements for the mailboxes from JSON
-                    // currently supported and required fields are:
-                    //      domain
-                    //      name
-                    //      ownerId
-                    //      ownerType
+                    $scope.mailboxImport.mailboxes = mailboxes;
                 });
             }, false);
             reader.readAsText(file);
@@ -423,7 +449,15 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             var processed = 0;
 
             async.eachSeries($scope.mailboxImport.mailboxes, function (mailbox, callback) {
-                Client.addMailbox(mailbox.domain, mailbox.name, mailbox.ownerId, mailbox.ownerType, function (error) {
+                var owner = $scope.owners.find(function (o) { return o.display === mailbox.owner && o.type === mailbox.ownerType; }); // owner may not exist
+                if (!owner) {
+                    $scope.mailboxImport.error.import.push({ error: new Error('Could not detect owner'), mailbox: mailbox });
+                    ++processed;
+                    $scope.mailboxImport.percent = 100 * processed / $scope.mailboxImport.mailboxes.length;
+                    return callback();
+                }
+
+                Client.addMailbox(mailbox.domain, mailbox.name, owner.id, mailbox.ownerType, function (error) {
                     if (error) $scope.mailboxImport.error.import.push({ error: error, mailbox: mailbox });
                     else ++$scope.mailboxImport.success;
 
@@ -437,6 +471,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
                 $scope.mailboxImport.busy = false;
                 $scope.mailboxImport.done = true;
+                if ($scope.mailboxImport.success) $scope.mailboxes.refresh();
             });
         }
     };
diff --git a/src/views/users.js b/src/views/users.js
index 31b4858bf..1f2421e8c 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -145,7 +145,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                             var items = line.split(',');
                             if (items.length !== 5) {
                                 $scope.userImport.error = { file: 'Line ' + (i+1) + ' has wrong column count. Expecting 5' };
-                                break;
+                                return;
                             }
                             users.push({
                                 username: items[0].trim(),