diff --git a/src/email.js b/src/mail.js
similarity index 97%
rename from src/email.js
rename to src/mail.js
index 2532c70fe..9b0a5e563 100644
--- a/src/email.js
+++ b/src/mail.js
@@ -5,7 +5,7 @@ exports = module.exports = {
     getStatus: getStatus,
     checkRblStatus: checkRblStatus,
 
-    EmailError: EmailError
+    MailError: MailError
 };
 
 var assert = require('assert'),
@@ -25,7 +25,7 @@ var assert = require('assert'),
 
 const digOptions = { server: '127.0.0.1', port: 53, timeout: 5000 };
 
-function EmailError(reason, errorOrMessage) {
+function MailError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
     assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
 
@@ -43,9 +43,9 @@ function EmailError(reason, errorOrMessage) {
         this.nestedError = errorOrMessage;
     }
 }
-util.inherits(EmailError, Error);
-EmailError.INTERNAL_ERROR = 'Internal Error';
-EmailError.BAD_FIELD = 'Bad Field';
+util.inherits(MailError, Error);
+MailError.INTERNAL_ERROR = 'Internal Error';
+MailError.BAD_FIELD = 'Bad Field';
 
 function checkOutboundPort25(callback) {
     assert.strictEqual(typeof callback, 'function');
@@ -120,7 +120,7 @@ function verifyRelay(relay, callback) {
     var verifier = relay.provider === 'cloudron-smtp' ? checkOutboundPort25 : checkSmtpRelay.bind(null, relay);
 
     verifier(function (error) {
-        if (error) return callback(new EmailError(EmailError.BAD_FIELD, error.message));
+        if (error) return callback(new MailError(MailError.BAD_FIELD, error.message));
 
         callback();
     });
diff --git a/src/routes/settings.js b/src/routes/settings.js
index 64273bb4d..052dfdd0e 100644
--- a/src/routes/settings.js
+++ b/src/routes/settings.js
@@ -39,8 +39,7 @@ exports = module.exports = {
 var assert = require('assert'),
     certificates = require('../certificates.js'),
     CertificatesError = require('../certificates.js').CertificatesError,
-    config = require('../config.js'),
-    email = require('../email.js'),
+    mail = require('../mail.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     safe = require('safetydance'),
@@ -228,7 +227,7 @@ function getCloudronAvatar(req, res, next) {
 }
 
 function getEmailStatus(req, res, next) {
-    email.getStatus(function (error, records) {
+    mail.getStatus(function (error, records) {
         if (error) return next(new HttpError(500, error));
 
         next(new HttpSuccess(200, records));
diff --git a/src/settings.js b/src/settings.js
index dfb60214c..6edd572fe 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -80,11 +80,11 @@ var assert = require('assert'),
     CronJob = require('cron').CronJob,
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:settings'),
+    mail = require('./mail.js'),
+    MailError = mail.MailError,
     moment = require('moment-timezone'),
     paths = require('./paths.js'),
     platform = require('./platform.js'),
-    email = require('./email.js'),
-    EmailError = email.EmailError,
     safe = require('safetydance'),
     settingsdb = require('./settingsdb.js'),
     superagent = require('superagent'),
@@ -438,8 +438,8 @@ function setMailRelay(relay, callback) {
     assert.strictEqual(typeof relay, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    email.verifyRelay(relay, function (error) {
-        if (error && error.reason === EmailError.BAD_FIELD) return callback(new SettingsError(SettingsError.BAD_FIELD, error.message));
+    mail.verifyRelay(relay, function (error) {
+        if (error && error.reason === MailError.BAD_FIELD) return callback(new SettingsError(SettingsError.BAD_FIELD, error.message));
         if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
 
         settingsdb.set(exports.MAIL_RELAY_KEY, JSON.stringify(relay), function (error) {