diff --git a/data/web/inc/functions.quarantaine.inc.php b/data/web/inc/functions.quarantaine.inc.php
index db4ae7c2..15b8b94f 100644
--- a/data/web/inc/functions.quarantaine.inc.php
+++ b/data/web/inc/functions.quarantaine.inc.php
@@ -224,9 +224,10 @@ function quarantaine($_action, $_data = null) {
           }
         }
         else {
-          foreach (mailbox('get', 'mailboxes') as $mbox) {
-            $stmt = $pdo->prepare('SELECT `id`, `qid`, `rcpt`, `sender`, UNIX_TIMESTAMP(`created`) AS `created` FROM `quarantaine` WHERE `rcpt` = :mbox');
-            $stmt->execute(array(':mbox' => $mbox));
+          $domains = array_merge(mailbox('get', 'domains'), mailbox('get', 'alias_domains'));
+          foreach ($domains as $domain) {
+            $stmt = $pdo->prepare('SELECT `id`, `qid`, `rcpt`, `sender`, UNIX_TIMESTAMP(`created`) AS `created` FROM `quarantaine` WHERE `rcpt` REGEXP :domain');
+            $stmt->execute(array(':domain' => '@' . $domain . '$'));
             $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
             while($row = array_shift($rows)) {
               $q_meta[] = $row;