diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 271caa4..4af0c08 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.475")]
-[assembly: AssemblyFileVersion("3.0.1.475")]
+[assembly: AssemblyVersion("3.0.1.476")]
+[assembly: AssemblyFileVersion("3.0.1.476")]
diff --git a/WebApplication/PageDiscussion.ascx.cs b/WebApplication/PageDiscussion.ascx.cs
index 6107700..62fa61e 100644
--- a/WebApplication/PageDiscussion.ascx.cs
+++ b/WebApplication/PageDiscussion.ascx.cs
@@ -105,7 +105,6 @@ namespace ScrewTurn.Wiki {
 			// Print header
 			sb.Append(@"<div class=""messageheader"">");
 			//sb.AppendFormat(@"<a id=""MSG_{0}""></a>", message.ID);
-			sb.AppendFormat(@"<a id=""{0}"" href=""#{0}"" title=""Permalink"">&#0182;</a> ", Tools.GetMessageIdForAnchor(message.DateTime));
 
 			if(!currentPage.Provider.ReadOnly) {
 				// Print reply/edit/delete buttons only if provider is not read-only
@@ -144,6 +143,9 @@ namespace ScrewTurn.Wiki {
 				sb.Append("</div>");
 			}
 
+			sb.Append(@"<div>");
+			sb.AppendFormat(@"<a id=""{0}"" href=""#{0}"" title=""Permalink"">&#0182;</a> ", Tools.GetMessageIdForAnchor(message.DateTime));
+
 			// Print subject
 			if(message.Subject.Length > 0) {
 				sb.Append(@"<span class=""messagesubject"">");
@@ -162,6 +164,8 @@ namespace ScrewTurn.Wiki {
 
 			sb.Append("</div>");
 
+			sb.Append("</div>");
+
 			// Print body
 			sb.Append(@"<div class=""messagebody"">");
 			sb.Append(FormattingPipeline.FormatWithPhase3(FormattingPipeline.FormatWithPhase1And2(message.Body, false, FormattingContext.MessageBody, currentPage),