diff --git a/public/include/classes/mail.class.php b/public/include/classes/mail.class.php
index efe32ef3..af3090cd 100644
--- a/public/include/classes/mail.class.php
+++ b/public/include/classes/mail.class.php
@@ -62,6 +62,8 @@ class Mail extends Base {
     $headers = 'From: Website Administration <' . $this->setting->getValue('website_email') . ">\n";
     $headers .= "MIME-Version: 1.0\n";
     $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+    if (strlen($aData['senderName']) > 0 && strlen($aData['senderEmail']) > 0 )
+      $headers .= 'Reply-To: ' . $aData['senderName'] . ' <' . $aData['senderEmail'] . ">\n";
     if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template  . '.tpl'), $headers))
       return true;
     $this->setErrorMessage($this->sqlError('E0031'));