From 108ad84944837f348cb809bdfdfe0652e39a6789 Mon Sep 17 00:00:00 2001
From: Vishnu KS <yo@vishnuks.com>
Date: Tue, 14 Jul 2020 11:47:00 +0530
Subject: [PATCH] billing: Use no-reply address as from_address in sponsorship
 emails.

---
 corporate/tests/test_stripe.py | 3 ++-
 corporate/views.py             | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index 97cd594083..6036e49450 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -1092,7 +1092,8 @@ class StripeTest(StripeTestCase):
             self.assertEqual(len(message.to), 1)
             self.assertEqual(message.to[0], "desdemona+admin@zulip.com")
             self.assertEqual(message.subject, "Sponsorship request (Open-source) for zulip")
-            self.assertEqual(message.from_email, f'{user.full_name} <{user.delivery_email}>')
+            self.assertEqual(message.reply_to, ['hamlet@zulip.com'])
+            self.assertIn('Zulip sponsorship <noreply-', message.from_email)
             self.assertIn("User role: Member", message.body)
             self.assertIn("Support URL: http://zulip.testserver/activity/support?q=zulip", message.body)
             self.assertIn("Website: https://infinispan.org", message.body)
diff --git a/corporate/views.py b/corporate/views.py
index 4ee6130f33..66c99890e9 100644
--- a/corporate/views.py
+++ b/corporate/views.py
@@ -217,8 +217,9 @@ def sponsorship(request: HttpRequest, user: UserProfile,
     send_email(
         "zerver/emails/sponsorship_request",
         to_emails=[FromAddress.SUPPORT],
-        from_name=user.full_name,
-        from_address=user.delivery_email,
+        from_name="Zulip sponsorship",
+        from_address=FromAddress.tokenized_no_reply_address(),
+        reply_to_email=user.delivery_email,
         context=context,
     )