diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 67efc31677..0dc7c56c54 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -534,9 +534,9 @@ class mail_sieve
 			{
 				$content = $vacation = $vacRules['vacation'];
 				if (!empty($profileID)) $content['acc_id'] = $profileID;
-				if (empty($vacation['addresses']))
+				if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
 				{
-					$content['addresses'] = '';
+					$content['addresses'] = $vacRules['aliases'];
 				}
 				if (!empty($vacation['forwards']))
 				{