diff --git a/web/root/msgs/msgs.ssjs b/web/root/msgs/msgs.ssjs
index f8fbdc84970ab3596cc3b19aaa2bd8066c7bc7cb..cdff1f7110397d7a1cdb46d2276ce5cd0c7341a5 100644
--- a/web/root/msgs/msgs.ssjs
+++ b/web/root/msgs/msgs.ssjs
@@ -57,8 +57,6 @@ for(var page=firstpage;page<=lastpage;page++) {
 
 hdr=msgbase.get_msg_header(true,msgbase.total_msgs-1-offset-max_messages);
 if(hdr!=null)  {
-	if(hdr.subject=='')
-		hdr.subject="-- No Subject --";
 	template.pagelinks+='<a href="'+path+'?msg_grp='+g+'&msg_sub='+encodeURIComponent(sub)+'&offset='+(offset+max_messages)+'">NEXT</a>';
 }
 
@@ -92,6 +90,8 @@ template.group=msg_area.grp_list[g];
 for(;displayed<max_messages && (hdr=msgbase.get_msg_header(true,last_offset)) != null;last_offset--) {
 	if(hdr==null)
 		continue;
+	if(hdr.subject=='')
+		hdr.subject="-- No Subject --";
 	if(sub=='mail' && hdr.to!=user.alias && hdr.to!=user.name && hdr.to !=user.netmail)
 		continue;
 	template.messages[displayed.toString()]=hdr;