diff --git a/defaults/main.yml b/defaults/main.yml
index 538a2057e6544c61ecf7189ecda078aaf08ebd19..dfbbd160e2fc3d16f5fa6856942c46cd6212deff 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -30,3 +30,4 @@ gitlab:
   upload_size_max: 128M
   mail: {}
     #from: 'git@domain'
+    #reply_to: 'git@domain'
diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2
index 476f2e0bb1a31add5bde104c5cab0d1d2f4e9af0..0e8506a463b8e71b3156ad690a9aadacfe6ef70c 100644
--- a/templates/gitlab.rb.j2
+++ b/templates/gitlab.rb.j2
@@ -76,7 +76,9 @@ gitlab_rails['gitlab_ssh_host'] = '{{ gitlab.gitlab_ssh_host }}'
 gitlab_rails['gitlab_email_from'] = '{{ gitlab.mail.from }}'
 {% endif %}
 # gitlab_rails['gitlab_email_display_name'] = 'Example'
-# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
+{% if gitlab.mail.reply_to %}
+gitlab_rails['gitlab_email_reply_to'] = '{{ gitlab.mail.reply_to }}'
+{% endif %}
 # gitlab_rails['gitlab_email_subject_suffix'] = ''
 # gitlab_rails['gitlab_email_smime_enabled'] = false
 # gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key'