diff --git a/web/root/msgs/msgs.ssjs b/web/root/msgs/msgs.ssjs
index 30ea594d9405cb7de88d1faabab544bbac334d40..f8fbdc84970ab3596cc3b19aaa2bd8066c7bc7cb 100644
--- a/web/root/msgs/msgs.ssjs
+++ b/web/root/msgs/msgs.ssjs
@@ -57,6 +57,8 @@ 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>';
 }