diff --git a/docs/events/messenger_email_template_ext_override.txt b/docs/events/messenger_email_template_ext_override.txt
deleted file mode 100644
index a469de8..0000000
--- a/docs/events/messenger_email_template_ext_override.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-TITLE
-=====
-[RFC] Let an extension override a core notification email .txt template
-
-BODY
-====
-This started from a CDB support request (topic 202586): "add the email
-address in the admin-approval-email and make it possible to ban the
-email domain directly from there." Actually adding a placeholder to
-the post_in_queue/topic_in_queue notification email turned out to be
-impossible for an extension today, traced all the way through core.
-
-An extension CAN override what \phpbb\notification\type\post_in_queue
-puts into an email (get_email_template_variables() is a normal PHP
-method, and the service can be swapped in the extension's own
-services.yml, same technique many extensions already use to customize
-a core notification type). Adding a brand new template VARIABLE this
-way is easy.
-
-What an extension CANNOT do is get that new variable to actually
-appear in the sent email, because the email BODY comes from a fixed
-.txt file phpBB itself owns:
-
-	language/en/email/post_in_queue.txt
-
-Traced the resolution path directly in includes/functions_messenger.php,
-the messenger::template() method:
-
-	$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-	$template_path .= $template_lang . '/email';
-
-	$template_paths = array(
-		$template_path . $template_dir_prefix,
-	);
-
-Every path built in this method is rooted at $phpbb_root_path . 'language/'
-(or the user's board-configured language path), with only board-default
-and 'en' fallbacks layered on top. There is no branch anywhere in this
-method that looks under an extension's own ext/<vendor>/<name>/language/
-tree. Confirmed by searching the whole file for any extension/ext_manager
-awareness, none exists.
-
-This is a real, structural gap: an extension can add new authors,
-new subjects, new URLs to a notification type's email variables, but
-has no way to make a core .txt template actually use them. The only
-current workaround is either patching core (against project convention)
-or shipping a whole new, separately-fired notification type with its
-own extension-owned email template, which does not help when the goal
-is enriching an EXISTING core notification.
-
-PROPOSED CHANGE
-----------------
-File: includes/functions_messenger.php, class messenger, method template()
-Location: where $template_paths / $ext_template_paths are assembled,
-before $this->set_template_paths() is called.
-
-Add an extension-language search path alongside the existing core one,
-following the same pattern phpBB's style/template system already uses
-for extension-provided style overrides (styles/<style>/template/ext/<vendor>/<name>/...).
-Something in the shape of:
-
-	if (!empty($phpbb_extension_manager))
-	{
-		foreach ($phpbb_extension_manager->all_enabled() as $ext_name => $ext_path)
-		{
-			$ext_template_paths[] = array(
-				'name'		=> $template_lang . '_email_ext_' . $ext_name,
-				'ext_path'	=> $ext_path . 'language/' . $template_lang . '/email' . $template_dir_prefix,
-			);
-		}
-	}
-
-placed so extension-provided files are searched before the core
-fallback, letting an extension ship its own language/en/email/post_in_queue.txt
-that phpBB's template engine picks up ahead of core's copy, the exact
-mechanism style templates already have via @vendor_ext/template.html.
-
-TESTING
--------
-Verified against phpBB release-3.3.17: read includes/functions_messenger.php's
-messenger::template() method in full, confirmed every template path
-built there is rooted at core's own language/ directory or the board's
-configured language path, with no extension-relative branch anywhere
-in the method or elsewhere in the file.
diff --git a/docs/events/phpbb-rfc-extension-email-template-override.txt b/docs/events/phpbb-rfc-extension-email-template-override.txt
new file mode 100644
index 0000000..841fa26
--- /dev/null
+++ b/docs/events/phpbb-rfc-extension-email-template-override.txt
@@ -0,0 +1,50 @@
+PROJECT: phpBB (PHPBB)
+ISSUE TYPE: Improvement
+SUMMARY: Allow an enabled extension to override a core notification email
+	.txt template
+PRIORITY: Minor
+COMPONENT: Events
+AFFECTS VERSION: 3.3.17
+
+TYPE
+====
+PHP event
+
+LOCATION
+========
+includes/functions_messenger.php, messenger::template(), before
+set_template_paths() is called.
+
+(Alternatively, as an extension of
+\phpbb\template\twig\twig::set_custom_style()'s existing per-extension
+discovery loop, which already walks all_enabled() extensions but only
+ever looks under styles/<name>/template|theme/, never
+language/<lang>/email/.)
+
+PURPOSE
+=======
+Let an enabled extension supply its own copy of a core notification email
+template (e.g. language/en/email/post_in_queue.txt), so it can customize
+the rendered content of an existing core notification without patching
+core or duplicating the whole notification type.
+
+USE CASE
+========
+Originates from a request to add the recipient's email address to the
+post_in_queue admin-approval email. Extensions can already add data via
+get_email_template_variables(), but nothing resolves email templates from
+an extension's own directory, so there's no way to reference that new
+data in the email body.
+
+core.notification_message_email technically allows rewriting the
+fully-rendered $subject/$msg post-template, but only as opaque string
+surgery on already-composed text — no variable placeholder, no
+per-language file — not a substitute for template-level customization.
+
+VARIABLES
+=========
+- template_lang (string, read-only) — language being resolved
+- template_dir_prefix (string, read-only) — subdirectory prefix in play
+- template_paths (array, MODIFIABLE) — filesystem paths searched for the
+  template file; a listener appends its own extension-owned directory
+  here