diff --git a/migrations/20160527010012-mailboxes-add-table.js b/migrations/20160527010012-mailboxes-add-table.js
new file mode 100644
index 000000000..5b7f00bdb
--- /dev/null
+++ b/migrations/20160527010012-mailboxes-add-table.js
@@ -0,0 +1,25 @@
+'use strict';
+
+var dbm = global.dbm || require('db-migrate');
+var type = dbm.dataType;
+
+exports.up = function(db, callback) {
+	var cmd = 'CREATE TABLE mailboxes(' +
+				'id VARCHAR(128) NOT NULL,' +
+				'name VARCHAR(128) NOT NULL UNIQUE,' +
+				'aliasTarget VARCHAR(128),' +
+				'creationTime TIMESTAMP,' +
+				'PRIMARY KEY (id))';
+
+    db.runSql(cmd, function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
+
+exports.down = function(db, callback) {
+    db.runSql('DROP TABLE mailboxes', function (error) {
+        if (error) console.error(error);
+        callback(error);
+    });
+};
diff --git a/migrations/schema.sql b/migrations/schema.sql
index 5d0e08c51..9efedf67c 100644
--- a/migrations/schema.sql
+++ b/migrations/schema.sql
@@ -118,3 +118,11 @@ CREATE TABLE IF NOT EXISTS eventlog(
     creationTime TIMESTAMP,
 
     PRIMARY KEY (id));
+
+CREATE TABLE IF NOT EXISTS mailboxes(
+    id VARCHAR(128) NOT NULL,
+    name VARCHAR(128) NOT NULL UNIQUE,
+    aliasTarget VARCHAR(128), /* the target if type is an alias */
+    creationTime TIMESTAMP,
+
+    PRIMARY KEY (id));