diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
index d68509812bbcd..f6cf72704f493 100644
--- a/administrator/components/com_config/model/form/application.xml
+++ b/administrator/components/com_config/model/form/application.xml
@@ -459,6 +459,27 @@
 			showon="mailonline:1"
 		/>
 
+		<field
+			name="replyto"
+			type="email"
+			label="COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_DESC"
+			filter="string"
+			size="30"
+			validate="email"
+			showon="mailonline:1"
+		/>
+
+		<field
+			name="replytoname"
+			type="text"
+			label="COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL"
+			description="COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_DESC"
+			filter="string"
+			size="30"
+			showon="mailonline:1"
+		/>
+
 		<field
 			name="mailer"
 			type="list"
diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini
index c11d57d2b5a48..bbaa9b93bb48d 100644
--- a/administrator/language/en-GB/en-GB.com_config.ini
+++ b/administrator/language/en-GB/en-GB.com_config.ini
@@ -105,6 +105,10 @@ COM_CONFIG_FIELD_MAIL_FROM_EMAIL_DESC="The email address that will be used to se
 COM_CONFIG_FIELD_MAIL_FROM_EMAIL_LABEL="From email"
 COM_CONFIG_FIELD_MAIL_FROM_NAME_DESC="Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."
 COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To email"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_DESC="The email address that will be used to receive end user(s) reply"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL="Reply To Name"
+COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_DESC="Text displayed in the header &quot;To:&quot; field when end user(s) replying to received email"
 COM_CONFIG_FIELD_MAIL_MAILONLINE_DESC="Select Yes to turn on mail sending, select No to turn off mail sending. Warning: It is advised to put the site offline when disabling the mail function!"
 COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send Mail"
 COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC="Select Yes to disable the Mass Mail Users function, select No to make it active."
diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist
index 54064188418c2..dbaa9ef74dfb7 100644
--- a/installation/configuration.php-dist
+++ b/installation/configuration.php-dist
@@ -60,14 +60,16 @@ class JConfig {
 	public $session_handler = 'database';
 
 	/* Mail Settings */
-	public $mailer = 'mail';
-	public $mailfrom = '';
-	public $fromname = '';
-	public $sendmail = '/usr/sbin/sendmail';
-	public $smtpauth = '0';
-	public $smtpuser = '';
-	public $smtppass = '';
-	public $smtphost = 'localhost';
+	public $mailer      = 'mail';
+	public $mailfrom    = '';
+	public $fromname    = '';
+	public $replyto     = '';
+	public $replytoname = '';
+	public $sendmail    = '/usr/sbin/sendmail';
+	public $smtpauth    = '0';
+	public $smtpuser    = '';
+	public $smtppass    = '';
+	public $smtphost    = 'localhost';
 
 	/* Cache Settings */
 	public $caching = '0';
diff --git a/libraries/joomla/mail/mail.php b/libraries/joomla/mail/mail.php
index f0bdb12c74a4c..a86f3eac99eff 100644
--- a/libraries/joomla/mail/mail.php
+++ b/libraries/joomla/mail/mail.php
@@ -672,6 +672,9 @@ public function useSmtp($auth = null, $host = null, $user = null, $pass = null,
 	public function sendMail($from, $fromName, $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachment = null,
 		$replyTo = null, $replyToName = null)
 	{
+		// Create config object
+		$config = JFactory::getConfig();
+
 		$this->setSubject($subject);
 		$this->setBody($body);
 
@@ -722,6 +725,10 @@ public function sendMail($from, $fromName, $recipient, $subject, $body, $mode =
 				return false;
 			}
 		}
+		elseif ($config->get('replyto'))
+		{
+			$this->addReplyTo($config->get('replyto'), $config->get('replytoname'));
+		}
 
 		// Add sender to replyTo only if no replyTo received
 		$autoReplyTo = (empty($this->ReplyTo)) ? true : false;