From b5b019dfcfbef7e4535163d5e25c2cdb15a152f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20Toulet?=
 <35176601+AgnesToulet@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:56:49 +0200
Subject: [PATCH] Notifications: fix reply-to option for emails (#25748)

---
 pkg/services/notifications/mailer.go        | 1 +
 pkg/services/notifications/notifications.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index 3e4279719d8..f3ff047de25 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -183,6 +183,7 @@ func (ns *NotificationService) buildEmailMessage(cmd *models.SendEmailCommand) (
 		Body:          buffer.String(),
 		EmbeddedFiles: cmd.EmbeddedFiles,
 		AttachedFiles: buildAttachedFiles(cmd.AttachedFiles),
+		ReplyTo:       cmd.ReplyTo,
 	}, nil
 }
 
diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 5705138fdcd..d101c20cbe7 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -126,6 +126,7 @@ func (ns *NotificationService) sendEmailCommandHandlerSync(ctx context.Context,
 		SingleEmail:   cmd.SingleEmail,
 		EmbeddedFiles: cmd.EmbeddedFiles,
 		Subject:       cmd.Subject,
+		ReplyTo:       cmd.ReplyTo,
 	})
 
 	if err != nil {