diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 46bd85a3bc..2c2d9ee36b 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1295,6 +1295,22 @@ ucp_pm_viewmessage_post_buttons_before
 * Purpose: Add post button to private messages (next to edit, quote etc), at
 the start of the list.
 
+ucp_pm_viewmessage_post_buttons_list_after
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+* Since: 3.1.6-RC1
+* Purpose: Add post button custom list to private messages (next to edit, quote etc),
+after the original list.
+
+ucp_pm_viewmessage_post_buttons_list_before
+===
+* Locations:
+    + styles/prosilver/template/ucp_pm_viewmessage.html
+* Since: 3.1.6-RC1
+* Purpose: Add post button custom list to private messages (next to edit, quote etc),
+before the original list.
+
 ucp_pm_viewmessage_print_head_append
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 02c5f5b1a5..4f4a663dd5 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -73,7 +73,9 @@
 	<div class="postbody">
 		<h3 class="first">{SUBJECT}</h3>
 
-		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT -->
+		<!-- DEFINE $SHOW_PM_POST_BUTTONS = (U_EDIT or U_DELETE or U_REPORT or U_QUOTE) -->
+		<!-- EVENT ucp_pm_viewmessage_post_buttons_list_before -->
+		<!-- IF $SHOW_PM_POST_BUTTONS -->
 		<ul class="post-buttons">
 			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
 			<!-- IF U_EDIT -->
@@ -99,6 +101,7 @@
 			<!-- EVENT ucp_pm_viewmessage_post_buttons_after -->
 		</ul>
 		<!-- ENDIF -->
+		<!-- EVENT ucp_pm_viewmessage_post_buttons_list_after -->
 
 		<p class="author">
 			<strong>{L_SENT_AT}{L_COLON}</strong> {SENT_DATE}