diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php
index 0721b62a..a37f5e78 100644
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -2800,7 +2800,7 @@ function mailbox($_action, $_type, $_data = null, $attr = null) {
             return false;
           }
           try {
-            $stmt = $pdo->prepare("SELECT REPLACE(`address`, ',', ' ') AS `address` FROM `alias` WHERE `address` != `goto` AND `domain` = :domain");
+            $stmt = $pdo->prepare("SELECT `address` FROM `alias` WHERE `address` != `goto` AND `domain` = :domain");
             $stmt->execute(array(
               ':domain' => $_data,
             ));
diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index 24276f15..886c28ca 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -469,7 +469,7 @@ jQuery(function($){
               '<a href="#" id="delete_selected" data-id="single-alias" data-api-url="delete/alias" data-item="' + encodeURIComponent(item.address) + '" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-trash"></span> ' + lang.remove + '</a>' +
               '</div>';
             item.chkbox = '<input type="checkbox" data-id="alias" name="multi_select" value="' + encodeURIComponent(item.address) + '" />';
-            item.goto = escapeHtml(item.goto);
+            item.goto = escapeHtml(item.goto.replace(/,/g, " "));
             if (item.is_catch_all == 1) {
               item.address = '<div class="label label-default">Catch-All</div> ' + escapeHtml(item.address);
             }