diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 01da0516fecd..12f05be9b0f9 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -1620,6 +1620,18 @@
 :Type: str
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``error_email_reply_to_user``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    When sending email reports for tool errors, include the user's
+    email address in the Reply-to SMTP header (used by some ticketing
+    systems to identify the appropriate response address).
+:Default: ``None``
+:Type: bool
+
+
 ~~~~~~~~~~~~~~
 ``email_from``
 ~~~~~~~~~~~~~~
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 4e807958e685..d2585104bbcd 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -1105,6 +1105,11 @@ galaxy:
   # user may encounter.
   #error_email_to: null
 
+  # When sending email reports for tool errors, include the user's email
+  # address in the Reply-to SMTP header (used by some ticketing systems
+  # to identify the appropriate response address).
+  #error_email_reply_to_user: false
+
   # Email address to use in the 'From' field when sending emails for
   # account activations, workflow step notifications, password resets,
   # and tool error reports.  We recommend using a string in the