diff --git a/phpBB/templates/Default/posting_body.tpl b/phpBB/templates/Default/posting_body.tpl
index 259b61cd81..68c625f2af 100644
--- a/phpBB/templates/Default/posting_body.tpl
+++ b/phpBB/templates/Default/posting_body.tpl
@@ -37,20 +37,22 @@ function addBBcode(bbCode)
          	<tr class="tableheader">
          	  <td colspan="2">{L_POST_A}</td>
          	</tr>
+			<!-- BEGIN anon_user -->
             <tr class="tablebody">
 	           <td bgcolor="#DDDDDD">{L_USERNAME}</td>
-	           <td bgcolor="#CCCCCC">{USERNAME_INPUT}</td>
+	           <td bgcolor="#CCCCCC"><input type="text" name="username" size="25" maxlength="25" value="{USERNAME}" /></td>
             </tr>
+			<!-- END anon_user -->
                 <tr class="tablebody">
                    <td bgcolor="#DDDDDD">{L_SUBJECT}</td>
-                   <td bgcolor="#CCCCCC">{SUBJECT_INPUT}</td>
+                   <td bgcolor="#CCCCCC"><input type="text" name="subject" size="50" maxlength="100" value="{SUBJECT}" /></td>
                 </tr>
                 <tr class="tablebody">
                     <td bgcolor="#DDDDDD">{L_MESSAGE_BODY}<br><br>
                       {L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></td>
                     <td bgcolor="#CCCCCC">
                     <table border="0" with="100%">
-                    		<tr><td>{MESSAGE_INPUT}</td>
+                    		<tr><td><textarea name="message" rows="10" cols="40" wrap="virtual">{MESSAGE}</textarea></td>
                     			 <td width="60%">Instant BBCode<br>
                     			 	<a href="javascript: x()" onclick="addBBcode('[url] [/url]');"><img src="templates/Default/images//url.gif" width="72" height="16" border="0" alt="Insert URL BBCode"></a>&nbsp;
                             	<a href="javascript: x()" onclick="addBBcode('[email] [/email]');"><img src="templates/Default/images//email_url.gif" width="72" height="16" border="0" alt="Insert Email Address"></a>
@@ -73,7 +75,50 @@ function addBBcode(bbCode)
                 </tr>
                 <tr class="tablebody">
                       <td bgcolor="#DDDDDD">{L_OPTIONS}</td>
-                       <td bgcolor="#CCCCCC">{HTML_TOGGLE}<br>{BBCODE_TOGGLE}<br>{SMILE_TOGGLE}<br>{SIG_TOGGLE}<br>{NOTIFY_TOGGLE}<br>{DELETE_TOGGLE}<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{TYPE_TOGGLE}</td>
+                       <td bgcolor="#CCCCCC"><table cellspacing="0" cellpadding="1" border="0">
+					<!-- BEGIN html_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="disable_html" {S_HTML_CHECKED} /></td>
+						<td>{L_DISABLE_HTML}</td>
+					</tr>
+					<!-- END html_checkbox -->
+					<!-- BEGIN bbcode_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /></td>
+						<td>{L_DISABLE_BBCODE}</td>
+					</tr>
+					<!-- END bbcode_checkbox -->
+					<!-- BEGIN smilies_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} /></td>
+						<td>{L_DISABLE_SMILIES}</td>
+					</tr>
+					<!-- END smilies_checkbox -->
+					<!-- BEGIN signature_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="attach_sig" {S_SIGNATURE_CHECKED} /></td>
+						<td>{L_ATTACH_SIGNATURE}</td>
+					</tr>
+					<!-- END signature_checkbox -->
+					<!-- BEGIN notify_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="notify" {S_NOTIFY_CHECKED} /></td>
+						<td>{L_NOTIFY_ON_REPLY}</td>
+					</tr>
+					<!-- END notify_checkbox -->
+					<!-- BEGIN delete_checkbox -->
+					<tr>
+						<td><input type="checkbox" name="delete" /></td>
+						<td>{L_DELETE_POST}</td>
+					</tr>
+					<!-- END delete_checkbox -->
+					<!-- BEGIN type_toggle -->
+					<tr>
+						<td></td>
+						<td><br />{S_TYPE_TOGGLE}</td>
+					</tr>
+					<!-- END type_toggle -->
+				</table></td>
 		</tr>
         <tr class="tableheader">
 		   <td align="center" colspan="2">{S_HIDDEN_FORM_FIELDS}