diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index edd45880a7..69be22b9e2 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -35,7 +35,7 @@ if ( !empty($board_config['privmsg_disable']) )
 	message_die(GENERAL_MESSAGE, 'PM_disabled');
 }
 
-$html_entities_match = array('#&#', '#<#', '#>#');
+$html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#');
 $html_entities_replace = array('&amp;', '&lt;', '&gt;');
 
 //