diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 4c9d609007..ea94a94107 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2562,7 +2562,7 @@ class mail_compose
 				if (!empty($addr)) $_emailAddressList[]=$addr;
 			}
 		}
-		return array_values($_emailAddressList);
+		return is_array($_emailAddressList) ? array_values($_emailAddressList) : (array)$_emailAddressList;
 	}
 
 	/**