diff --git a/release-notes/8.0.0/feat/4083.md b/release-notes/8.0.0/feat/4083.md
new file mode 100644
index 0000000000..ab7501dd43
--- /dev/null
+++ b/release-notes/8.0.0/feat/4083.md
@@ -0,0 +1,3 @@
+- add [Reviewed-on and Reviewed-by variables](https://codeberg.org/forgejo/forgejo/commit/4ddd9af50fbfcfb2ebf629697a803b3bce56c4af) to the merge template
+- [add the `[ui.csv].MAX_ROWS` setting](https://codeberg.org/forgejo/forgejo/commit/433b6c6910f8699dc41787ef8f5148b122b4677e) to avoid displaying a large number of lines (defaults to 2500)
+- [add a setting to override or add headers of all outgoing emails](https://codeberg.org/forgejo/forgejo/commit/1d4bff4f65d5e4a3969871ef91d3612daf272b45), for instance `Reply-To` or `In-Reply-To`
diff --git a/release-notes/8.0.0/fix/4083.md b/release-notes/8.0.0/fix/4083.md
new file mode 100644
index 0000000000..fa4772f672
--- /dev/null
+++ b/release-notes/8.0.0/fix/4083.md
@@ -0,0 +1 @@
+- [NuGet Package fails `choco info pkgname` when `pkgname` is also a substring of another package Id](https://codeberg.org/forgejo/forgejo/commit/c6e04c3c9eddfa6c4bec541f681c8d300b157cdb)