diff --git a/pgcommitfest/commitfest/forms.py b/pgcommitfest/commitfest/forms.py
index a01b437e..444905b1 100644
--- a/pgcommitfest/commitfest/forms.py
+++ b/pgcommitfest/commitfest/forms.py
@@ -5,7 +5,7 @@
 from django.http import Http404
 
 from .ajax import _archivesAPI
-from .models import MailThread, Patch, PatchOnCommitFest, Tag, TargetVersion
+from .models import Patch, PatchOnCommitFest, Tag, TargetVersion
 from .widgets import ThreadPickWidget
 
 
@@ -214,91 +214,6 @@ def clean_threadmsgid(self):
         return self.cleaned_data["threadmsgid"]
 
 
-def _fetch_thread_choices(patch):
-    for mt in patch.mailthread_set.order_by("-latestmessage"):
-        ti = sorted(
-            _archivesAPI("/message-id.json/%s" % mt.messageid),
-            key=lambda x: x["date"],
-            reverse=True,
-        )
-        yield [
-            mt.subject,
-            [
-                (
-                    "%s,%s" % (mt.messageid, t["msgid"]),
-                    "From %s at %s" % (t["from"], t["date"]),
-                )
-                for t in ti
-            ],
-        ]
-
-
-review_state_choices = (
-    (0, "Tested"),
-    (1, "Passed"),
-)
-
-
-def reviewfield(label):
-    return forms.MultipleChoiceField(
-        choices=review_state_choices,
-        label=label,
-        widget=forms.CheckboxSelectMultiple,
-        required=False,
-    )
-
-
-class CommentForm(forms.Form):
-    responseto = forms.ChoiceField(choices=[], required=True, label="In response to")
-
-    # Specific checkbox fields for reviews
-    review_installcheck = reviewfield("make installcheck-world")
-    review_implements = reviewfield("Implements feature")
-    review_spec = reviewfield("Spec compliant")
-    review_doc = reviewfield("Documentation")
-
-    message = forms.CharField(required=True, widget=forms.Textarea)
-    newstatus = forms.ChoiceField(
-        choices=PatchOnCommitFest.OPEN_STATUS_CHOICES(), label="New status"
-    )
-
-    def __init__(self, patch, poc, is_review, *args, **kwargs):
-        super(CommentForm, self).__init__(*args, **kwargs)
-        self.is_review = is_review
-
-        self.fields["responseto"].choices = _fetch_thread_choices(patch)
-        self.fields["newstatus"].initial = poc.status
-        if not is_review:
-            del self.fields["review_installcheck"]
-            del self.fields["review_implements"]
-            del self.fields["review_spec"]
-            del self.fields["review_doc"]
-
-    def clean_responseto(self):
-        try:
-            (threadid, respid) = self.cleaned_data["responseto"].split(",")
-            self.thread = MailThread.objects.get(messageid=threadid)
-            self.respid = respid
-        except MailThread.DoesNotExist:
-            raise ValidationError("Selected thread appears to no longer exist")
-        except Exception:
-            raise ValidationError("Invalid message selected")
-        return self.cleaned_data["responseto"]
-
-    def clean(self):
-        if self.is_review:
-            for fn, f in self.fields.items():
-                if fn.startswith("review_") and fn in self.cleaned_data:
-                    if (
-                        "1" in self.cleaned_data[fn]
-                        and "0" not in self.cleaned_data[fn]
-                    ):
-                        self.errors[fn] = (
-                            ("Cannot pass a test without performing it!"),
-                        )
-        return self.cleaned_data
-
-
 class BulkEmailForm(forms.Form):
     reviewers = forms.CharField(required=False, widget=HiddenInput())
     authors = forms.CharField(required=False, widget=HiddenInput())
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index d4bb7805..01552912 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -51,14 +51,7 @@
          <div class="alert alert-danger">{{e}}</div>
         {%endfor%}
        {%endif%}
-       {%if field.name|slice:":7" == 'review_' %}
-        {%for choice in field %}
-         <div class="form-check form-check-inline">
-          <input type="checkbox" class="form-check-input" name="{{field.name}}" value="{{choice.data.value}}" id="{{choice.id_for_label}}" {% if choice.data.selected %}checked{% endif %}>
-          <label class="form-check-label" for="{{choice.id_for_label}}">{{choice.choice_label}}</label>
-         </div>
-        {%endfor%}
-       {%elif not field.name in form.selectize_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
+       {%if not field.name in form.selectize_fields%}{{field|field_class:"form-control"}}{%else%}{{field}}{%endif%}
        {%if field.help_text%}<br/>{{field.help_text|safe}}{%endif%}</div>
      </div>
     {%endif%}
diff --git a/pgcommitfest/commitfest/templates/help.html b/pgcommitfest/commitfest/templates/help.html
index 609f0214..1b7d556f 100644
--- a/pgcommitfest/commitfest/templates/help.html
+++ b/pgcommitfest/commitfest/templates/help.html
@@ -24,6 +24,9 @@ <h2>Patches</h2>
  <p>
   A "patch" is a bit of an overloaded term in the PostgreSQL community. Email threads on the mailing list often contain "patch files" as attachments, such a file is often referred to as a "patch". A single email can even contain multiple related "patch files", which are called a "patchset". However, in the context of a Commitfest app a "patch" usually means a "patch entry" in the Commitfest app. Such a "patch entry" is a reference to a mailinglist thread on which change to PostgreSQL has been proposed, by someone sending an email that contain one or more "patch files". The Commitfest app will automatically detect new versions of the patch files and update the "patch entry" accordingly.
  </p>
+ <p>
+  To comment on or review a patch, reply to its thread on the mailinglist. If the thread is not in your inbox, open its latest message in the archives (linked on the patch page), log in, and use "Resend email" to get a copy that you can reply to.
+ </p>
  <p>
   There are three "Active" categories of patch status:
   <ul>
diff --git a/pgcommitfest/commitfest/templates/patch.html b/pgcommitfest/commitfest/templates/patch.html
index 2121bcf5..2de090b0 100644
--- a/pgcommitfest/commitfest/templates/patch.html
+++ b/pgcommitfest/commitfest/templates/patch.html
@@ -265,6 +265,33 @@ <h4 class="modal-title">Flag as committed</h4>
   </div>
  </div>
 
+{%comment%}review instructions dialog{%endcomment%}
+ <div class="modal fade" id="reviewModal" role="dialog">
+  <div class="modal-dialog">
+   <div class="modal-content">
+    <div class="modal-header">
+     <h4 class="modal-title">Review</h4>
+     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+    </div>
+    <div class="modal-body">
+     <p>Reviews are posted by replying to the patch's thread on the mailinglist. If the thread isn't in your inbox:</p>
+     <ol>
+      <li>Open the latest message in the archives (or whichever message you want to reply to):
+       <ul>
+        {%for t in patch.mailthread_set.all%}
+         <li><a href="https://www.postgresql.org/message-id/{{t.latestmsgid}}">{{t.subject}}</a></li>
+        {%endfor%}
+       </ul>
+      </li>
+      <li>Log in and click "Resend email" to get a copy in your inbox.</li>
+      <li>Reply all to that email with your review.</li>
+     </ol>
+     <p class="mb-0">Afterwards, use "Change Status" if needed.</p>
+    </div>
+   </div>
+  </div>
+ </div>
+
  {%include "thread_attach.inc"%}
 {%comment%}Modal dialog for adding annotation{%endcomment%}
  <div class="modal fade" id="annotateModal" role="dialog">
diff --git a/pgcommitfest/commitfest/templates/patch_commands.inc b/pgcommitfest/commitfest/templates/patch_commands.inc
index a1f45e7e..2811a20b 100644
--- a/pgcommitfest/commitfest/templates/patch_commands.inc
+++ b/pgcommitfest/commitfest/templates/patch_commands.inc
@@ -1,13 +1,6 @@
 <div style="margin-bottom:5px;">
  <a class="btn btn-secondary" href="edit/">Edit</a>
-
- <div class="btn-group">
-  <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">Comment/Review</button>
-  <ul class="dropdown-menu">
-   <li><a class="dropdown-item" href="comment/">Comment</a></li>
-   <li><a class="dropdown-item" href="review/">Review</a></li>
-  </ul>
- </div>
+ <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#reviewModal">Review</button>
 
  <div class="btn-group">
   <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">Change Status</button>
diff --git a/pgcommitfest/commitfest/tests/test_patch_email.py b/pgcommitfest/commitfest/tests/test_patch_email.py
new file mode 100644
index 00000000..5b3d3ad2
--- /dev/null
+++ b/pgcommitfest/commitfest/tests/test_patch_email.py
@@ -0,0 +1,38 @@
+from datetime import datetime
+from email import message_from_string
+
+import pytest
+
+from pgcommitfest.commitfest.models import Patch, PatchOnCommitFest
+from pgcommitfest.mailqueue.models import QueuedMail
+
+pytestmark = pytest.mark.django_db
+
+
+def test_staff_email_not_sent_from_manager_address(
+    client, open_cf, alice, charlie, settings
+):
+    patch = Patch.objects.create(name="Test patch")
+    patch.authors.add(alice)
+    PatchOnCommitFest.objects.create(
+        patch=patch, commitfest=open_cf, enterdate=datetime.now()
+    )
+    charlie.is_staff = True
+    charlie.save()
+    client.force_login(charlie)
+
+    client.post(
+        f"/patch/{patch.id}/send_email/",
+        {
+            "authors": patch.id,
+            "reviewers": "",
+            "subject": "Hi",
+            "body": "Rebase",
+            "confirm": "on",
+        },
+    )
+
+    mail = QueuedMail.objects.get()
+    msg = message_from_string(mail.fullmsg)
+    assert mail.sender == settings.NOTIFICATION_FROM
+    assert msg["Reply-To"] == "Charlie Chen <charlie@example.com>"
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 0a697c9f..ef0a3831 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -20,10 +20,8 @@
 import json
 import urllib
 from datetime import datetime, timedelta
-from email.mime.text import MIMEText
-from email.utils import formatdate, make_msgid
 
-from pgcommitfest.mailqueue.util import send_mail, send_simple_mail
+from pgcommitfest.mailqueue.util import send_simple_mail
 from pgcommitfest.userprofile.models import UserProfile
 from pgcommitfest.userprofile.util import UserWrapper
 
@@ -31,7 +29,6 @@
 from .feeds import ActivityFeed
 from .forms import (
     BulkEmailForm,
-    CommentForm,
     CommitFestFilterForm,
     NewPatchForm,
     PatchForm,
@@ -1109,147 +1106,6 @@ def newpatch(request, cfid):
     )
 
 
-def _review_status_string(reviewstatus):
-    if "0" in reviewstatus:
-        if "1" in reviewstatus:
-            return "tested, passed"
-        else:
-            return "tested, failed"
-    else:
-        return "not tested"
-
-
-@login_required
-@transaction.atomic
-def comment(request, patchid, what):
-    patch = get_object_or_404(Patch, pk=patchid)
-    cf = patch.current_commitfest()
-    poc = get_object_or_404(PatchOnCommitFest, patch=patch, commitfest=cf)
-    is_review = what == "review"
-
-    if request.method == "POST":
-        try:
-            form = CommentForm(patch, poc, is_review, data=request.POST)
-        except Exception as e:
-            messages.add_message(
-                request,
-                messages.ERROR,
-                "Failed to build list of response options from the archives: %s" % e,
-            )
-            return HttpResponseRedirect("/%s/%s/" % (cf.id, patch.id))
-
-        if form.is_valid():
-            if is_review:
-                txt = (
-                    "The following review has been posted through the commitfest application:\n%s\n\n%s"
-                    % (
-                        "\n".join(
-                            [
-                                "%-25s %s"
-                                % (
-                                    f.label + ":",
-                                    _review_status_string(form.cleaned_data[fn]),
-                                )
-                                for (fn, f) in form.fields.items()
-                                if fn.startswith("review_")
-                            ]
-                        ),
-                        form.cleaned_data["message"],
-                    )
-                )
-            else:
-                txt = form.cleaned_data["message"]
-
-            if int(form.cleaned_data["newstatus"]) != poc.status:
-                poc.status = int(form.cleaned_data["newstatus"])
-                poc.save()
-                PatchHistory(
-                    patch=poc.patch,
-                    by=request.user,
-                    what="New status: %s" % poc.statusstring,
-                ).save_and_notify()
-                txt += "\n\nThe new status of this patch is: %s\n" % poc.statusstring
-
-            msg = MIMEText(txt, _charset="utf-8")
-
-            if form.thread.subject.startswith("Re:"):
-                msg["Subject"] = form.thread.subject
-            else:
-                msg["Subject"] = "Re: %s" % form.thread.subject
-
-            msg["To"] = settings.HACKERS_EMAIL
-            msg["From"] = UserWrapper(request.user).encoded_email_header
-
-            # CC the authors of a patch, if there are any
-            authors = list(patch.authors.all())
-            if len(authors):
-                msg["Cc"] = ", ".join(
-                    [UserWrapper(a).encoded_email_header for a in authors]
-                )
-
-            msg["Date"] = formatdate(localtime=True)
-            msg["User-Agent"] = "pgcommitfest"
-            msg["X-cfsender"] = request.user.username
-            msg["In-Reply-To"] = "<%s>" % form.respid
-            # We just add the "top" messageid and the one we're responding to.
-            # This along with in-reply-to should indicate clearly enough where
-            # in the thread the message belongs.
-            msg["References"] = "<%s> <%s>" % (form.thread.messageid, form.respid)
-            msg["Message-ID"] = make_msgid("pgcf")
-
-            uw = UserWrapper(request.user)
-            msgstring = msg.as_string()
-            send_mail(uw.email, settings.HACKERS_EMAIL, msgstring)
-            for a in authors:
-                # Actually send a copy directly to the author. Just setting the Cc field doesn't
-                # make it deliver the email...
-                send_mail(uw.email, UserWrapper(a).email, msgstring)
-
-            PatchHistory(
-                patch=patch,
-                by=request.user,
-                what="Posted %s with messageid %s" % (what, msg["Message-ID"]),
-            ).save()
-
-            messages.add_message(
-                request,
-                messages.INFO,
-                "Your email has been queued for %s, and will be sent within a few minutes."
-                % (settings.HACKERS_EMAIL),
-            )
-
-            return HttpResponseRedirect("/%s/%s/" % (cf.id, patch.id))
-    else:
-        try:
-            form = CommentForm(patch, poc, is_review)
-        except Exception as e:
-            messages.add_message(
-                request,
-                messages.ERROR,
-                "Failed to build list of response options from the archives: %s" % e,
-            )
-            return HttpResponseRedirect("/%s/%s/" % (cf.id, patch.id))
-
-    return render(
-        request,
-        "base_form.html",
-        {
-            "cf": cf,
-            "form": form,
-            "patch": patch,
-            "extraformclass": "patchcommentform",
-            "breadcrumbs": [
-                {"title": cf.title, "href": "/%s/" % cf.pk},
-                {"title": "View patch", "href": "/%s/%s/" % (cf.pk, patch.pk)},
-            ],
-            "title": "Add %s" % what,
-            "note": '<b>Note!</b> This form will generate an email to the public mailinglist <i>%s</i>, with sender set to <i>%s</i>!<br/>Please ensure that the email settings for your domain (<a href="https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail" target="_blank">DKIM</a>, <a href="https://en.wikipedia.org/wiki/SPF" target="_blank">SPF</a>) allow emails from external sources.'
-            % (settings.HACKERS_EMAIL, UserWrapper(request.user).email),
-            "savebutton": "Send %s" % what,
-        },
-    )
-
-
 @login_required
 @transaction.atomic
 def status(request, patchid, status):
@@ -1524,13 +1380,22 @@ def send_email(request, cfid):
 
             recipients = User.objects.filter(q).distinct()
 
+            # We send from our own address instead of the manager's, because
+            # many domains have a DMARC policy that causes emails with their
+            # address in the From header to be rejected when they're not sent
+            # through their own mail servers. Reply-To makes replies still go
+            # to the manager.
+            uw = UserWrapper(request.user)
             for r in recipients:
                 send_simple_mail(
-                    UserWrapper(request.user).email,
+                    settings.NOTIFICATION_FROM,
                     r.email,
                     form.cleaned_data["subject"],
                     form.cleaned_data["body"],
                     request.user.username,
+                    sendername="%s %s via PostgreSQL Commitfest"
+                    % (request.user.first_name, request.user.last_name),
+                    replyto=uw.encoded_email_header,
                 )
                 messages.add_message(
                     request, messages.INFO, "Sent email to %s" % r.email
@@ -1569,7 +1434,8 @@ def send_email(request, cfid):
     messages.add_message(
         request,
         messages.INFO,
-        "Email will be sent from: %s" % UserWrapper(request.user).email,
+        "Email will be sent from %s, with replies going to: %s"
+        % (settings.NOTIFICATION_FROM, UserWrapper(request.user).email),
     )
 
     def _user_and_mail(u):
diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py
index 441802b3..48fbbef0 100644
--- a/pgcommitfest/mailqueue/util.py
+++ b/pgcommitfest/mailqueue/util.py
@@ -1,23 +1,36 @@
 from django.template.loader import get_template
 
 from email import encoders
+from email.header import Header
 from email.mime.multipart import MIMEMultipart
 from email.mime.nonmultipart import MIMENonMultipart
 from email.mime.text import MIMEText
-from email.utils import formatdate
+from email.utils import formataddr, formatdate
 
 from .models import QueuedMail
 
 
 def send_simple_mail(
-    sender, receiver, subject, msgtxt, sending_username, attachments=None
+    sender,
+    receiver,
+    subject,
+    msgtxt,
+    sending_username,
+    attachments=None,
+    sendername=None,
+    replyto=None,
 ):
     # attachment format, each is a tuple of (name, mimetype,contents)
     # content should already be base64 encoded
     msg = MIMEMultipart()
     msg["Subject"] = subject
     msg["To"] = receiver
-    msg["From"] = sender
+    if sendername:
+        msg["From"] = formataddr((str(Header(sendername, "utf-8")), sender))
+    else:
+        msg["From"] = sender
+    if replyto:
+        msg["Reply-To"] = replyto
     msg["Date"] = formatdate(localtime=True)
     msg["User-Agent"] = "pgcommitfest"
     if sending_username:
diff --git a/pgcommitfest/urls.py b/pgcommitfest/urls.py
index f6953347..d246241a 100644
--- a/pgcommitfest/urls.py
+++ b/pgcommitfest/urls.py
@@ -39,7 +39,6 @@
     re_path(r"^patch/(\d+)/reviewer/remove_all/$", views.remove_all_reviewers),
     re_path(r"^patch/(\d+)/committer/(become|remove)/$", views.committer),
     re_path(r"^patch/(\d+)/(un)?subscribe/$", views.subscribe),
-    re_path(r"^patch/(\d+)/(comment|review)/", views.comment),
     re_path(r"^patch/(\d+)/cfbot_requeue/$", views.cfbot_requeue),
     re_path(r"^(\d+)/send_email/$", views.send_email),
     re_path(r"^patch/(\d+)/send_email/$", views.send_patch_email),