diff --git a/src/addons.js b/src/addons.js
index a8fdf753b..206ba05a4 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -402,9 +402,11 @@ function setupSendMail(app, options, callback) {
 
     debugApp(app, 'Setting up SendMail');
 
-    mailboxdb.getByOwnerId(app.id, function (error, mailbox) {
+    mailboxdb.getByOwnerId(app.id, function (error, results) {
         if (error) return callback(error);
 
+        var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
+
         var env = [
             "MAIL_SMTP_SERVER=mail",
             "MAIL_SMTP_PORT=2525",
@@ -435,9 +437,11 @@ function setupRecvMail(app, options, callback) {
 
     debugApp(app, 'Setting up recvmail');
 
-    mailboxdb.getByOwnerId(app.id, function (error, mailbox) {
+    mailboxdb.getByOwnerId(app.id, function (error, results) {
         if (error) return callback(error);
 
+        var mailbox = results.filter(function (r) { return !r.aliasTarget; })[0];
+
         var env = [
             "MAIL_IMAP_SERVER=mail",
             "MAIL_IMAP_PORT=9993",