diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 61e15a467e..952f969bd6 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -181,6 +181,12 @@ function compose_pm($id, $mode, $action)
 			trigger_error('NO_AUTHOR');
 		}
 
+		if ($action == 'quotepost')
+		{
+			// Decode text for message display
+			decode_message($message_text, $post['bbcode_uid']);
+		}
+
 		if ($action != 'delete')
 		{
 			$enable_urls = $post['enable_magic_url'];