diff --git a/templates/index.html b/templates/index.html
index c0196e93..37577ff9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -25,9 +25,9 @@
 		}
 	{% endraw %}</style>{% endif %}
 </head>
-<body>
+<body>	
 	{{ boardlist.top }}
-	{% if pm %}<div class="top_notice">{{ pm }}</div><hr />{% endif %}
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_height %}style="width:{% if config.banner_width %}{{ config.banner_width }}px{% endif %};height:{{ config.banner_height }}px" {% endif %}alt="" />{% endif %}
 	<h1>{{ board.url }} - {{ board.name }}</h1>
 	<div class="title">{% if board.title %}{{ board.title }}{% endif %}<p>{% if mod %}<a href="?/">Return to dashboard</a>{% endif %}</p></div>
@@ -161,4 +161,4 @@
 	<p class="unimportant" style="text-align:center;">All trademarks, copyrights, comments, and images on this page are owned by or are the responsibility of their respective parties.</p>
 		
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/page.html b/templates/page.html
index f246757b..5186dd6d 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -10,7 +10,7 @@
 	<script type="text/javascript" src="{{ config.url_javascript }}"></script>
 </head>
 <body>
-	{% if pm %}<div class="top_notice">{{ pm }}</div><hr />{% endif %}
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	<h1>{{ title }}</h1>
 	<div class="title">{% if subtitle %}{{subtitle}}{% endif %}<p>{% if mod %}<a href="?/">Return to dashboard</a>{% endif %}</p></div>
 	{{ body }}
diff --git a/templates/thread.html b/templates/thread.html
index 265b6063..909325f8 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -27,7 +27,7 @@
 </head>
 <body>
 	{{ boardlist.top }}
-	{% if pm %}<div class="top_notice">{{ pm }}</div><hr />{% endif %}
+	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_height %}style="width:{% if config.banner_width %}{{ config.banner_width }}px{% endif %};height:{{ config.banner_height }}px" {% endif %}alt="" />{% endif %}
 	<h1>{{ board.url }} - {{ board.name }}</h1>
 	<div class="title">{% if board.title %}{{ board.title }}{% endif %}<p>{% if mod %}<a href="?/">Return to dashboard</a>{% endif %}</p></div>
