diff --git a/app/email/email_test.go b/app/email/email_test.go
index 4b0ebb7844..d7d109065f 100644
--- a/app/email/email_test.go
+++ b/app/email/email_test.go
@@ -4,6 +4,7 @@
 package email
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -93,3 +94,44 @@ func TestSendInviteEmails(t *testing.T) {
 		verifyMailbox(t)
 	})
 }
+
+func TestSendCloudTrialEndWarningEmail(t *testing.T) {
+	th := Setup(t).InitBasic()
+	defer th.TearDown()
+	th.ConfigureInbucketMail()
+
+	emailTo := "testclouduser@example.com"
+	emailToUsername := strings.Split(emailTo, "@")[0]
+
+	t.Run("SendCloudTrialEndWarningEmail", func(t *testing.T) {
+		verifyMailbox := func(t *testing.T) {
+			t.Helper()
+
+			var resultsMailbox mail.JSONMessageHeaderInbucket
+			err2 := mail.RetryInbucket(5, func() error {
+				var err error
+				resultsMailbox, err = mail.GetMailBox(emailTo)
+				return err
+			})
+			if err2 != nil {
+				t.Skipf("No email was received, maybe due load on the server: %v", err2)
+			}
+
+			require.Len(t, resultsMailbox, 1)
+			require.Contains(t, resultsMailbox[0].To[0], emailTo, "Wrong To: recipient")
+			resultsEmail, err := mail.GetMessageFromMailbox(emailTo, resultsMailbox[0].ID)
+			require.NoError(t, err, "Could not get message from mailbox")
+			require.Contains(t, resultsEmail.Body.HTML, "http://testserver", "Wrong received message %s", resultsEmail.Body.Text)
+			require.Contains(t, resultsEmail.Body.HTML, emailToUsername, "Wrong received message %s", resultsEmail.Body.Text)
+			require.Contains(t, resultsEmail.Body.Text, "http://testserver", "Wrong received message %s", resultsEmail.Body.Text)
+			require.Contains(t, resultsEmail.Body.Text, emailToUsername, "Wrong received message %s", resultsEmail.Body.Text)
+			require.Contains(t, resultsEmail.Body.Text, "feedback-cloud@mattermost.com")
+		}
+		mail.DeleteMailBox(emailTo)
+
+		err := th.service.SendCloudTrialEndWarningEmail(emailTo, emailToUsername, "June 23, 2200", th.BasicUser.Locale, "http://testserver")
+		require.NoError(t, err)
+
+		verifyMailbox(t)
+	})
+}
diff --git a/templates/cloud_trial_end_warning.html b/templates/cloud_trial_end_warning.html
index a38d42e5e5..c59c07bbae 100644
--- a/templates/cloud_trial_end_warning.html
+++ b/templates/cloud_trial_end_warning.html
@@ -387,7 +387,7 @@
                                 <td align="left" style="font-size:0px;padding:0px 0px ;word-break:break-word;">
                                   <div style="font-family:Arial;font-size:14px;line-height:20px;text-align:left;color:#3D3C40;">{{.Props.QuestionInfo}}
                                     <a href='mailto:{{.Props.SupportEmail}}'>
-                                      {{.Props.SupportEmail}}
+                                      feedback-cloud@mattermost.com
                                     </a>
                                   </div>
                                 </td>
diff --git a/templates/cloud_trial_end_warning.mjml b/templates/cloud_trial_end_warning.mjml
index c6d529f926..5b2f43f9a0 100644
--- a/templates/cloud_trial_end_warning.mjml
+++ b/templates/cloud_trial_end_warning.mjml
@@ -40,7 +40,7 @@
           <mj-text font-size="14px" line-height="20px" color="#3D3C40" padding="0px 0px " align="left" font-family="Arial">
             {{.Props.QuestionInfo}}
             <a href='mailto:{{.Props.SupportEmail}}'>
-              {{.Props.SupportEmail}}
+              feedback-cloud@mattermost.com
             </a>
           </mj-text>
         </mj-column>