diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 61cca83537f70c989edd2c415f0586474b0b5bd8..a1573c9e31271d9fb30d00fe1d56be36414f1f48 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -123,8 +123,8 @@ class maildeliver_plugin {
 			$sql = "SELECT * FROM mail_forwarding WHERE type = 'alias' AND destination = '".$app->db->quote($data["new"]["email"])."'";
 			$records = $app->db->queryAllRecords($sql);
 			$addresses = '';
-			if(is_array($records)) {
-				$addresses .= ':addresses [';
+			if(is_array($records) && count($records) > 0) {
+				$addresses .= ':addresses ["'.$data["new"]["email"].'",';
 				foreach($records as $rec) {
 					$addresses .= '"'.$rec['source'].'",';
 				}