diff --git a/public/list.php b/public/list.php
index d8b4b211..f22ce05d 100644
--- a/public/list.php
+++ b/public/list.php
@@ -108,11 +108,16 @@ if (safeget('output') == 'csv') {
             $columns[] = $key;
         }
     }
+
+    $fDomain = safepost('fDomain', safeget('domain', safesession('list-virtual:domain')));
+
     fputcsv($out, $header, ';');
 
     # print items as csv
     foreach ($items as $item) {
         $fields = array();
+        if (!empty($fDomain) && $item["domain"] != $fDomain) continue;
+
         foreach ($columns as $column) {
             $fields[] = $item[$column];
         }
diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl
index 8218e738..48efe07f 100644
--- a/templates/list-virtual.tpl
+++ b/templates/list-virtual.tpl
@@ -64,7 +64,7 @@
 	{if $tCanAddMailbox}
 		<br /><a href="{#url_create_mailbox#}&amp;domain={$fDomain|escape:"url"}" class="button">{$PALANG.add_mailbox}</a><br />
 	{/if}
-	<br /><br /><a href="list.php?table=mailbox&amp;output=csv">{$PALANG.download_csv}</a>
+	<br /><br /><a href="list.php?table=mailbox&amp;domain={$domain_selected}&amp;output=csv">{$PALANG.download_csv}</a>
 {/if}
 {if $CONF.show_status===YES && $CONF.show_status_key===YES}
 	<br/><br/>
diff --git a/templates/list.tpl b/templates/list.tpl
index c23bb799..75abcc26 100644
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -131,6 +131,6 @@
 <br /><a href="edit.php?table={$table|escape:"url"}" class="button">{$PALANG.{$formconf.create_button}}</a><br />
 <br />
 {/if}
-<br /><a href="list.php?table={$table|escape:"url"}&amp;output=csv">{$PALANG.download_csv}</a>
+<br /><a href="list.php?table={$table|escape:"url"}&amp;domain={$domain_selected}&amp;output=csv">{$PALANG.download_csv}</a>
 
 </div>