diff --git a/web/root/msgs/msg.ssjs b/web/root/msgs/msg.ssjs
index 76b5692d75b5515e85c43db02de70a719fde93ff..44a960e9e70b26d92a371c930da40569a9c416b4 100644
--- a/web/root/msgs/msg.ssjs
+++ b/web/root/msgs/msg.ssjs
@@ -1,6 +1,13 @@
 load("html_inc/msgslib.ssjs");
 load("html_inc/mime_decode.ssjs");
 
+if(sub=='mail') {
+    template.can_delete=true;
+}
+else {
+    template.can_delete=msg_area.sub[sub].is_operator;
+}
+
 if(msgbase.open!=undefined && msgbase.open()==false) {
 	error(msgbase.last_error);
 }
diff --git a/web/templates/msgs/msg.inc b/web/templates/msgs/msg.inc
index 3836287f49fa782da0d4e4132185c85af3db613f..469a07e2c49e0aba97939f7e27ec25e8f92feb14 100644
--- a/web/templates/msgs/msg.inc
+++ b/web/templates/msgs/msg.inc
@@ -22,12 +22,19 @@
         </object>
     </td>
 </tr>
-<tr class="msg"><td colspan="2">@@prevlink@@</td><td colspan="2" align="right">@@nextlink@@</td></tr>
-@@JS:if(template.replyto!=undefined) '<tr class="msg"><td colspan="4"><b>Reply To: </b><a href="msg.ssjs?msg_sub='+sub+'&amp;message='+template.replyto.number+'">'+template.replyto.subject+'</a> ('+template.replyto.from+')</td></tr>'; else '';@@
-@@JS:if(template.replies.length>0) '<tr class="msg"><td colspan="4"><b>Replies:</b></td></tr>'; else '';@@
+<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>
+@@JS:template.can_delete?'<td class="msgnavmid"><a href="management.ssjs?Action=Delete+Message%28s%29&amp;msg_sub=^^sub:code^^&amp;number=^^hdr:number^^">Delete</a></td>':'<td class="msgnavmid">Delete</td>'@@
+<td class="msgnavright">@@nextlink@@</td>
+</tr>
+@@JS:if(template.replyto!=undefined) '<tr class="msg"><td colspan="4"><b>In Reply To: </b><a href="msg.ssjs?msg_sub='+sub+'&amp;message='+template.replyto.number+'">'+template.replyto.subject+'</a> ('+template.replyto.from+')</td></tr>'; else '';@@
+@@JS:if(template.replies.length>0) '<tr class="msg"><td colspan="4"><b>Replies: </b>'; else '';@@
 <<REPEAT replies>>
-<tr class="msg"><td colspan="4"><a href="msg.ssjs?msg_sub=^^sub:code^^&amp;message=^^replies:number^^">%%replies:subject%%</a> (%%replies:from%%)</td></tr>
+<a href="msg.ssjs?msg_sub=^^sub:code^^&amp;message=^^replies:number^^">%%replies:subject%%</a> (%%replies:from%%)
 <<END REPEAT replies>>
+</td>
+</tr>
 </table>
 @@JS:if(template.attachments==undefined) '<!--'; else '';@@
 <b>Attachments:</b><br />
@@ -35,4 +42,4 @@
 <a href="attachments.ssjs/^^sub:code^^/^^hdr:number^^/^^attachments:name^^">%%attachments:name%%</a><br />
 <<END REPEAT attachments>>
 @@JS:if(template.attachments==undefined) '-->'; else '';@@
-<p class="msgcenter"><a href="reply.ssjs?msg_sub=^^sub:code^^&amp;reply_to=^^hdr:number^^">Reply</a> <a href="management.ssjs?Action=Delete+Message%28s%29&amp;msg_sub=^^sub:code^^&amp;number=^^hdr:number^^">Delete</a></p>
+<p class="msgcenter"> </p>