diff --git a/web/templates/default/msgs/msg.inc b/web/templates/default/msgs/msg.inc
index 1d74e6f9869bca85f9d3fce7e467e0c0a41f6514..e953767aae895041e9d9129b7435f29ae1e00470 100644
--- a/web/templates/default/msgs/msg.inc
+++ b/web/templates/default/msgs/msg.inc
@@ -1,4 +1,4 @@
-<p class="navigation"><a class="navigation" href="/index.ssjs">Home</a> : <a class="navigation" href="index.ssjs">Groups</a> : <a class="navigation" href="subs.ssjs?msg_grp=^^group:name^^">%%group:description%%</a> :
+<p class="navigation"><a class="navigation" href="/index.ssjs">Home</a>@@JS:template.sub.code!='mail'? ' : <a class="navigation" href="index.ssjs">Groups</a> :':''@@ <a class="navigation" href="subs.ssjs?msg_grp=^^group:name^^">%%group:description%%</a> :
 <a class="navigation" href="msgs.ssjs?msg_sub=^^sub:code^^">%%sub:description%%</a><br /></p>
 
 <table class="msg" border="0" width="95%">
@@ -35,7 +35,7 @@
 <table class="msg" width="95%">
 <tr>
     <td class="msgnavleft">@@prevlink@@</td>
-    <td class="msgnavmid"><a href="reply.ssjs?msg_sub=^^sub:code^^&amp;reply_to=^^hdr:number^^">Reply</a></td>
+    <td class="msgnavmid">@@JS:template.can_post?'<a href="reply.ssjs?msg_sub=^^sub:code^^&amp;reply_to=^^hdr:number^^">Reply</a>':'Reply'@@</td>
     @@JS:template.can_delete?'<td class="msgnavmid"><a href="management.ssjs?Action=Delete+Message%28s%29&amp;msg_sub='+template.sub.code+'&amp;number='+template.hdr.number+'">Delete</a></td>':'<td class="msgnavmid">Delete</td>'@@
     <td class="msgnavright">@@nextlink@@</td>
 </tr>
diff --git a/web/templates/default/msgs/msgs.inc b/web/templates/default/msgs/msgs.inc
index a36c40f26b85cc2715b31f453e53eb583fa62693..0c000434641f3bd5f496b80a196f62f7c67254b8 100644
--- a/web/templates/default/msgs/msgs.inc
+++ b/web/templates/default/msgs/msgs.inc
@@ -1,10 +1,13 @@
 <p class="navigation">
-    <a class="navigation" href="/index.ssjs">Home</a> : 
-    <a class="navigation" href="index.ssjs">Groups</a> : @@JS:if(template.group.name!="E-Mail") '<a class="navigation" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a> :'; else '';@@
-    <a class="navigation" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">%%sub:description%%</a> -&#062;
-    <a class="navigation" href="post.ssjs?msg_sub=^^sub:code^^&amp;post=new">Post New Message</a><br />
+    <a class="navigation" href="/index.ssjs">Home</a>@@JS:template.sub.code!='mail'? ' : <a class="navigation" href="index.ssjs">Groups</a> : <a class="navigation" href="subs.ssjs?msg_grp='+template.group.name+'">'+template.group.description+'</a> : ':' : '@@
+    <a class="navigation" href="subinfo.ssjs?msg_sub=^^sub:code^^" title="Click for Sub Info">%%sub:description%%</a>
+    <br />
 	@@JS:template.show_choice==undefined ? '' : '<span class="navigation">(@@show_choice@@)</span>'@@
 	</p>
+<div align="center">
+@@JS:template.can_post?'<form name="PostMsg" action="post.ssjs?msg_sub=^^sub:code^^&amp;post=new" method="post"><input type="submit" value="'+template.post_button+'" /></form>':''@@
+</div>
+
 <form name="DeleteMsg" action="management.ssjs" method="post">
 <input type="hidden" name="msg_sub" value="^^sub:code^^" />
 <table class="msglist" cellpadding="5" cellspacing="2" border="0" width="100%">
@@ -48,7 +51,7 @@
     <<END REPEAT messages>>
     </table>
     <br />
-    @@JS:template.can_delete?'<div align="center"><input type="button" onclick="SetAllCheckBoxes(\'DeleteMsg\', \'number\', true);" value="Select All">&nbsp;<input type="button" onclick="SetAllCheckBoxes(\'DeleteMsg\', \'number\', false);" value="Deselect All">&nbsp;	<input class="msg" type="submit" name="Action" value="Delete Message(s)" /></div>':''@@
+    @@JS:template.can_delete?'<div align="center"><input type="button" onclick="SetAllCheckBoxes(\'DeleteMsg\', \'number\', true);" value="Select All" />&nbsp;&nbsp;<input type="button" onclick="SetAllCheckBoxes(\'DeleteMsg\', \'number\', false);" value="Deselect All" />&nbsp;&nbsp;<input class="msg" type="submit" name="Action" value="Delete Message(s)" /></div>':''@@
 </form>
 		
 <script type="text/javascript">