diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index cb342ac300..7921b6df67 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1160,11 +1160,13 @@ class acp_users
 
 							if ($deleteall)
 							{
-								$deleted_warnings = '0';
+								$log_warnings = $deleted_warnings = 0;
 							}
 							else
 							{
-								$deleted_warnings = ' user_warnings - ' . $db->sql_affectedrows();
+								$num_warnings = (int) $db->sql_affectedrows();
+								$deleted_warnings = ' user_warnings - ' . $num_warnings;
+								$log_warnings = ($num_warnings > 2) ? 2 : $num_warnings;
 							}
 
 							$sql = 'UPDATE ' . USERS_TABLE . "
@@ -1172,7 +1174,18 @@ class acp_users
 								WHERE user_id = $user_id";
 							$db->sql_query($sql);
 
-							add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
+							switch ($log_warnings)
+							{
+								case 2:
+									add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings);
+								break;
+								case 1:
+									add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
+								break;
+								default:
+									add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
+								break;
+							}
 						}
 					}
 					else
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2dd28b2ffe..1a791ebff9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4035,7 +4035,7 @@ function page_footer($run_cron = true)
 			// Tidy the cache
 			$cron_type = 'tidy_cache';
 		}
-		else if ($config['warnings_last_gc'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
+		else if ($config['warnings_expire_days'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
 		{
 			$cron_type = 'tidy_warnings';
 		}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index ac8a14a21c..85380b2fd2 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -707,7 +707,6 @@ $lang = array_merge($lang, array(
 	'LOG_USER_REACTIVATE_USER'	=> '<strong>Forced user account reactivation</strong>',
 	'LOG_USER_UNLOCK'			=> '<strong>User unlocked own topic</strong><br />» %s',
 	'LOG_USER_WARNING'			=> '<strong>Added user warning</strong><br />» %s',
-	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br />» %s',
 	'LOG_USER_WARNING_BODY'		=> '<strong>The following warning was issued to this user</strong><br />» %s',
 
 	'LOG_USER_GROUP_CHANGE'			=> '<strong>User changed default group</strong><br />» %s',
@@ -716,6 +715,10 @@ $lang = array_merge($lang, array(
 	'LOG_USER_GROUP_JOIN_PENDING'	=> '<strong>User joined group and needs to be approved</strong><br />» %s',
 	'LOG_USER_GROUP_RESIGN'			=> '<strong>User resigned membership from group</strong><br />» %s',
 
+	'LOG_WARNING_DELETED'		=> '<strong>Deleted user warning</strong><br />» %s',
+	'LOG_WARNINGS_DELETED'		=> '<strong>Deleted %2$s user warnings</strong><br />» %1$s', // Example: '<strong>Deleted 2 user warnings</strong><br />» username'
+	'LOG_WARNINGS_DELETED_ALL'	=> '<strong>Deleted all user warnings</strong><br />» %s',
+
 	'LOG_WORD_ADD'			=> '<strong>Added word censor</strong><br />» %s',
 	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',
 	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index b9e6f5006d..abeecf8bf9 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -59,8 +59,7 @@
 		<dl class="details">
 		<!-- IF U_EMAIL --><dt>{L_EMAIL_ADDRESS}:</dt> <dd><a href="{U_EMAIL}">{L_SEND_EMAIL_USER} {USERNAME}</a></dd><!-- ENDIF -->
 		<!-- IF U_WWW --><dt>{L_WEBSITE}:</dt> <dd><a href="{U_WWW}" title="{L_VISIT_WEBSITE}: {U_WWW}">{U_WWW}</a></dd><!-- ENDIF -->
-		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd>
-		<!-- ENDIF -->
+		<!-- IF U_PM --><dt>{L_PM}:</dt> <dd><a href="{U_PM}">{L_SEND_PRIVATE_MESSAGE}</a></dd><!-- ENDIF -->
 		<!-- IF U_MSN or USER_MSN --><dt>{L_MSNM}:</dt> <dd><!-- IF U_MSN --><a href="{U_MSN}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_MSNM_MESSAGE}</a><!-- ELSE -->{USER_MSN}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_YIM or USER_YIM --><dt>{L_YIM}:</dt> <dd><!-- IF U_YIM --><a href="{U_YIM}" onclick="popup(this.href, 780, 550); return false;">{L_SEND_YIM_MESSAGE}</a><!-- ELSE -->{USER_YIM}<!-- ENDIF --></dd><!-- ENDIF -->
 		<!-- IF U_AIM or USER_AIM --><dt>{L_AIM}:</dt> <dd><!-- IF U_AIM --><a href="{U_AIM}" onclick="popup(this.href, 550, 320); return false;">{L_SEND_AIM_MESSAGE}</a><!-- ELSE -->{USER_AIM}<!-- ENDIF --></dd><!-- ENDIF -->
@@ -78,7 +77,7 @@
 		<dl class="details">
 			<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
 			<dt>{L_VISITED}:</dt> <dd>{VISITED}</dd>
-			<!-- IF WARNINGS -->
+			<!-- IF S_WARNINGS -->
 			<dt>{L_WARNINGS}: </dt>
 			<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
 			<!-- ENDIF -->