diff --git a/phpBB/templates/Euclid/posting_body.tpl b/phpBB/templates/Euclid/posting_body.tpl
index 9a8dbc39d1..891fb06083 100644
--- a/phpBB/templates/Euclid/posting_body.tpl
+++ b/phpBB/templates/Euclid/posting_body.tpl
@@ -237,7 +237,7 @@ function storeCaret(textEl) {
 			<!-- BEGIN privmsg_extensions -->
 			<tr>
 				<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
-				<td class="row2"><input type="text" name="username" maxlength="30" size="25" /> &nbsp; <input type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
+				<td class="row2"><input type="text" name="username" maxlength="30" size="25" /> &nbsp; <input class="liteoptiontable" type="submit"  name="usersubmit" value="{L_FIND_USERNAME}" onClick="window.open('search.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td>
 			</tr>
 			<!-- END privmsg_extensions -->
             <tr>
diff --git a/phpBB/templates/Euclid/posting_preview.tpl b/phpBB/templates/Euclid/posting_preview.tpl
index 256f8fa00d..6985b377b0 100644
--- a/phpBB/templates/Euclid/posting_preview.tpl
+++ b/phpBB/templates/Euclid/posting_preview.tpl
@@ -1,29 +1,63 @@
 
-<table width="90%" border="0" cellpadding="0" cellspacing="0" align="center">
+<table width="98%" cellpadding="0" cellspacing="0" border="0" align="center">
 	<tr>
-		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
+		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="4"  border="0">
 			<tr>
-		        <td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
+		        <td class="cat" colspan="2" height="30" align="center"><span class="cattitle">{L_PREVIEW}</span></td> 
+			</tr>
+			<tr>
+				<th width="160" height="25"><table width="160" cellspacing="0" cellpadding="0" border="0"> 
 	                <tr>
-               			<td><span class="cattitle"><b>{L_PREVIEW}</b></span></td> 
-	               </tr>
-      			</table></td>
-			</tr>
-			<tr>
-				<th>&nbsp;{L_MESSAGE}&nbsp;</th>
+               			<th>{L_AUTHOR}</th>
+					</tr>
+				</table></th>
+				<th width="100%" height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
+	                <tr>
+               			<th>{L_MESSAGE}</th>
+					</tr>
+				</table></th>
 			</tr>
+		</table></td>
+	</tr>
+	<tr>
+		<td class="cat" height="2"><img src="images/spacer.gif" height="2"></td>
+	</tr>
+	<tr>
+		<td class="tablebg"><table width="100%" cellspacing="1" cellpadding="4" border="0">
 			<tr bgcolor="{T_TD_COLOR1}">
+				<td width="160" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><table width="160" cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td valign="top"><span class="gen"><b>{POSTER_NAME}</b></span></td>
+					</tr>
+				</table></td>
 				<td height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="0" border="0">
 					<tr>
-						<td><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="gensmall">{L_POSTED}: {POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Post Subject: {POST_SUBJECT}</span><hr /></td>
+						<td><span class="gensmall">Post Subject: {POST_SUBJECT}</span><hr /></td>
 					</tr>
 					<tr>
 						<td height="100%" valign="top"><span class="gen">{MESSAGE}</span></td>
 					</tr>
 				</table></td>
 			</tr>
+			<tr bgcolor="{T_TD_COLOR1}">
+				<td align="left" valign="middle"><table cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td valign="middle"><img src="templates/Euclid/images/topic.gif" alt="" /></td>
+						<td>&nbsp;&nbsp;</td>
+						<td valign="middle"><span class="gensmall">{POST_DATE}</span></td>
+					</tr>
+				</table></td>
+				<td valign="middle"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td valign="middle">&nbsp;</td>
+					</tr>
+				</table></td>
+			</tr>
 		</table></td>
 	</tr>
+	<tr>
+		<td class="cat" height="2"><img src="images/spacer.gif" height="2"></td>
+	</tr>
 </table>
 
 <br clear="all" />
diff --git a/phpBB/templates/Euclid/posting_topic_review.tpl b/phpBB/templates/Euclid/posting_topic_review.tpl
index 25c6a21c1b..e5f757561b 100644
--- a/phpBB/templates/Euclid/posting_topic_review.tpl
+++ b/phpBB/templates/Euclid/posting_topic_review.tpl
@@ -1,6 +1,6 @@
 
 <!-- BEGIN switch_inline_mode -->
-<table width="90%" border="0" cellpadding="0" cellspacing="1" align="center">
+<table width="98%" border="0" cellpadding="0" cellspacing="1" align="center">
 	<tr> 
 		<td class="cat" height="30" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
 	</tr>
@@ -12,21 +12,21 @@
 	<tr>
 		<td width="100%" class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<th width="160"><table width="160" cellspacing="0" cellpadding="0" border="0"> 
+				<th width="160" height="25"><table width="160" cellspacing="0" cellpadding="0" border="0"> 
 	                <tr>
-               			<td align="center"><span class="gensmall"><b>{L_AUTHOR}</b></span></td>
+               			<th>{L_AUTHOR}</h>
 					</tr>
 				</table></th>
-				<th width="100%"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
+				<th width="100%" height="25"><table width="100%" cellspacing="0" cellpadding="0" border="0"> 
 	                <tr>
-               			<td align="center"><span class="gensmall"><b>{L_MESSAGE}</b></span></td>
+               			<th>{L_MESSAGE}</th>
 					</tr>
 				</table></th>
 			</tr>
 		</table></td>
 	</tr>
 	<tr>
-		<td><img src="images/spacer.gif" height="4" /></td>
+		<td class="cat" height="2"><img src="images/spacer.gif" height="2"></td>
 	</tr>
 </table>
 
@@ -35,7 +35,7 @@
 	<tr>
 		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr bgcolor="{postrow.ROW_COLOR}">
-				<td width="180" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><table width="180" cellspacing="0" cellpadding="0" border="0">
+				<td width="160" align="left" valign="top"><a name="{postrow.U_POST_ID}"></a><table width="160" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td valign="top"><span class="gen"><b>{postrow.POSTER_NAME}</b></span></td>
 					</tr>
@@ -44,23 +44,29 @@
 					<tr>
 						<td valign="top"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 							<tr>
-								<td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="gensmall">{L_POSTED}: {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
-								<td align="right" valign="middle" nowrap="nowrap">&nbsp; {postrow.EDIT_IMG} {postrow.QUOTE_IMG}&nbsp;</td>
-							</tr>
-							<tr>
-								<td colspan="2"><hr /></td>
+								<td valign="middle"><span class="gensmall">{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
 							</tr>
 						</table></td>
 					</tr>
 					<tr>
-						<td width="100%" height="100%" valign="top"><span class="gen">{postrow.MESSAGE}</span></td>
+						<td width="100%" height="100%" valign="top"><hr /><span class="gen">{postrow.MESSAGE}</span></td>
 					</tr>
 				</table></td>
 			</tr>
+			<tr bgcolor="{postrow.ROW_COLOR}">
+				<td align="left" valign="middle"><table cellspacing="0" cellpadding="0" border="0">
+					<tr>
+						<td valign="middle"><a href="#top"><img src="templates/Euclid/images/topic.gif" border="0" alt="" /></a></td>
+						<td>&nbsp;&nbsp;</td>
+						<td valign="middle"><span class="gensmall">{postrow.POST_DATE}</span></td>
+					</tr>
+				</table></td>
+				<td valign="middle">&nbsp;</td>
+			</tr>
 		</table></td>
 	</tr>
 	<tr>
-		<td><img src="images/spacer.gif" height="2" /></td>
+		<td class="cat" height="2"><img src="images/spacer.gif" height="2"></td>
 	</tr>
 </table>
  <!-- END postrow -->