diff --git a/interface/lib/classes/ispcmail.inc.php b/interface/lib/classes/ispcmail.inc.php
index dff71f3b89a70473e7e5f788d8fab4ffede0acb7..16247ab0f108fa314c0663630e46e6129d1c45c8 100644
--- a/interface/lib/classes/ispcmail.inc.php
+++ b/interface/lib/classes/ispcmail.inc.php
@@ -697,11 +697,11 @@ class ispcmail {
 				$recipname = $this->_encodeHeader($recipname, $this->mail_charset);
 
 				//Email From
-				fputs($this->_smtp_conn, 'MAIL FROM: ' . $this->_mail_sender . $this->_crlf);
+				fputs($this->_smtp_conn, 'MAIL FROM: <' . $this->_mail_sender . '>' . $this->_crlf);
 				$response = fgets($this->_smtp_conn, 515);
 
 				//Email To
-				fputs($this->_smtp_conn, 'RCPT TO: ' . $recip . $this->_crlf);
+				fputs($this->_smtp_conn, 'RCPT TO: <' . $recip . '>' . $this->_crlf);
 				$response = fgets($this->_smtp_conn, 515);
 
 				//The Email