service/email.md

@@ -1126,10 +1126,12 @@ domain. Inbound mail filters improved that situation significantly in
 ## Technical debt and next steps
 
 The next step in this project is to rebuild a proposal to followup on
-the long term plan from TPA-RFC-44 (TPA-RFC-45, [issue
+the long term plan from TPA-RFC-44 ([TPA-RFC-45][], [issue
 tpo/tpa/team#41009](https://gitlab.torproject.org/tpo/tpa/team/-/issues/41009)). This will mean either outsourcing mail
 services or building a proper mail hosting service.
 
+[TPA-RFC-45]: https://gitlab.torproject.org/tpo/tpa/team/-/wikis/policy/tpa-rfc-45-mail-architecture
+
 ### High availability
 
 We currently have no high availability/redundancy.
@@ -1177,17 +1179,24 @@ implemented a [syncthing backend](https://github.com/fragtion/dovecot-core).
 We went through a number of proposals to improve mail services over
 time:
 
- * [TPA-RFC-15: Email services](policy/tpa-rfc-15-email-services) (rejected, replaced with
+ * [TPA-RFC-15: Email services](policy/tpa-rfc-15-email-services): DKIM/SPF/DMARC records, mailboxes,
+   refactoring, legacy upgrades (rejected in 2022, replaced with
    TPA-RFC-31)
- * [TPA-RFC-31: outsource email services](policy/tpa-rfc-31-outsource-email) (rejected as well, in
-   favor of TPA-RFC-44 and following)
- * [TPA-RFC-44: Email emergency recovery](policy/tpa-rfc-44-email-emergency-recovery) (DKIM, SPF, DMARC
-   records, long term plan postponed)
- * TPA-RFC-45: Mail architecture (long term plans from TPA-RFC-44)
- * TPA-RFC-71: Emergency email deployments, phase B (implementation of SRS, done)
+ * [TPA-RFC-31: outsource email services](policy/tpa-rfc-31-outsource-email) (rejected in 2022 as
+   well, in favor of TPA-RFC-44 and following)
+ * [TPA-RFC-44: Email emergency recovery](policy/tpa-rfc-44-email-emergency-recovery): DKIM, SPF, DMARC
+   records (implemented in 2022, long term plan postponed)
+ * [TPA-RFC-45: Mail architecture][TPA-RFC-45]: long term plans spun off from
+   TPA-RFC-44, mostly mailboxes left to implement (draft since 2023,
+   needs rewrite after TPA-RFC-71)
+ * [TPA-RFC-71: Emergency email deployments, phase B][TPA-RFC-71]:
+   sender-rewriting, refactoring, legacy upgrades (mostly completed as
+   of 2025Q1)
  * [Enabling local delivery for regular nodes](https://gitlab.torproject.org/tpo/tpa/team/-/issues/42024)
  * [Email deliverability monitoring](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40494)
 
+[TPA-RFC-71]: https://gitlab.torproject.org/tpo/tpa/team/-/wikis/policy/tpa-rfc-71-emergency-email-deployments-round-2
+
 ## Submission server proposal
 
 Note: this proposal was discussed inline in the old