diff --git a/.asf.yaml b/.asf.yaml
index b90716eef70..4cbcd5355b3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -17,6 +17,27 @@
 
 # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
 ---
+
+# Attempt to make the auto-generated github emails more easily readable in email clients.
+custom_subjects:
+  new_pr: "[PR] {title} ({repository})"
+  close_pr: "Re: [PR] {title} ({repository})"
+  comment_pr: "Re: [PR] {title} ({repository})"
+  diffcomment: "Re: [PR] {title} ({repository})"
+  merge_pr: "Re: [PR] {title} ({repository})"
+  new_issue: "[I] {title} ({repository})"
+  comment_issue: "Re: [I] {title} ({repository})"
+  close_issue: "Re: [I] {title} ({repository})"
+  catchall: "[GH] {title} ({repository})"
+  new_discussion: "[D] {title} ({repository})"
+  edit_discussion: "Re: [D] {title} ({repository})"
+  close_discussion: "Re: [D] {title} ({repository})"
+  close_discussion_with_comment: "Re: [D] {title} ({repository})"
+  reopen_discussion: "Re: [D] {title} ({repository})"
+  new_comment_discussion: "Re: [D] {title} ({repository})"
+  edit_comment_discussion: "Re: [D] {title} ({repository})"
+  delete_comment_discussion: "Re: [D] {title} ({repository})"
+
 notifications:
   commits: commits@hop.apache.org
   issues: issues@hop.apache.org