diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index 9c466bcd9d030a7ac391ecfc806a405c3e82166d..3106dc477c58dad075bc550a6c03698c9e7b5b6a 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -123,13 +123,14 @@ class page_action extends tform_actions {
 		if(trim($this->dataRecord['destination']) == '') {
 			$app->tform->errorMessage .= $app->tform->lng('destination_error_empty') . '<br />';
 		} else {
-			$targets = preg_split('/\s*[,;]\s*/', trim($this->dataRecord['destination']));
+			$targets = preg_split('/[,;\s]+/', trim($this->dataRecord['destination']));
 			foreach($targets as $target) {
 				if(!$target || filter_var($target, FILTER_VALIDATE_EMAIL) === false) {
 					$app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '<br />';
 					break;
 				}
 			}
+			$this->dataRecord['destination'] = implode(', ', $targets);
 		}
 
 		//* Check if there is no active mailbox with this address