diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 1004624de2..998fea5de8 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -120,6 +120,7 @@
[Fix] Allow moving posts to invisible forums. (#27325)
[Fix] Don't allow promoting unapproved group members (#16124)
[Fix] Correctly fetch server name if using non-standard port (#27395)
+ [Fix] Regular expression for email matching in posts will no longer die on long words.
1.ii. Changes since 3.0.0
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0b6e4aafed..198004957c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2777,7 +2777,7 @@ function get_preg_expression($mode)
switch ($mode)
{
case 'email':
- return '(?:[a-z0-9\'\.\-_\+\|]|&)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+';
+ return '(?:[a-z0-9\'\.\-_\+\|]++|&)+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+';
break;
case 'bbcode_htm':