diff --git a/phpBB/templates/Default/profile_add_body.tpl b/phpBB/templates/Default/profile_add_body.tpl
index 8cce7152c1..8a01560de6 100755
--- a/phpBB/templates/Default/profile_add_body.tpl
+++ b/phpBB/templates/Default/profile_add_body.tpl
@@ -1,5 +1,5 @@
 <tr>
-  <td><form action="{S_PROFILE_ACTION}" method="POST">
+  <td><form action="{S_PROFILE_ACTION}" enctype="multipart/form-data" method="post">
    <table border="0" align="center" width="100%" bgcolor="#000000" cellpadding="0" cellspacing="1">
     <tr>
       <td>
@@ -58,6 +58,18 @@
 					<td bgcolor="#DDDDDD"><b>{L_INTERESTS}:</b></td>
 					<td bgcolor="#CCCCCC"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}"></td>
 				</tr>
+				<tr class="tablebody">
+					<td bgcolor="#DDDDDD"><b>{L_AVATAR}:</b><br /><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_AVATAR_EXPLAIN}</font></td>
+					<td bgcolor="#CCCCCC"><table cellspacing="2" cellpadding="0" border="0">
+						<tr class="tablebody">
+							<td align="center">{L_CURRENT_IMAGE}</font></td>
+							<td rowspan="2" valign="bottom">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{L_UPLOAD_IMAGE}:<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}"><input type="file" name="avatar"><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{L_DELETE_IMAGE}:<input type="checkbox" name="avatardel"></td>
+						</tr>
+						<tr class="tablebody">
+							<td align="center">&nbsp;{AVATAR}&nbsp;</td>
+						</tr>
+					</table></td>
+				</tr>
 				<tr class="tablebody">
 					<td bgcolor="#DDDDDD"><b>{L_SIGNATURE}:</b><br><font style="{font-size: 8pt;}">{L_SIGNATURE_EXPLAIN}</font></td>
 					<td bgcolor="#CCCCCC"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
diff --git a/phpBB/templates/Default/viewtopic_body.tpl b/phpBB/templates/Default/viewtopic_body.tpl
index 192cce7a6b..56bcb54db0 100644
--- a/phpBB/templates/Default/viewtopic_body.tpl
+++ b/phpBB/templates/Default/viewtopic_body.tpl
@@ -68,6 +68,7 @@
                    <font style="{font-size: 10pt; font-weight: bold;}">{postrow.POSTER_NAME}</font><br>
                    {postrow.POSTER_RANK}<br>
                    {postrow.RANK_IMAGE}<br>
+                   {postrow.POSTER_AVATAR}<br>
                    <br>
                    <font style="{font-size: 8pt;}">
                    {L_JOINED}: {postrow.POSTER_JOINED}<br>{L_POSTS}: {postrow.POSTER_POSTS}<br>{postrow.POSTER_FROM}</font>
@@ -76,8 +77,7 @@
 	          <td align="right" width="15%"><img src="images/posticon.gif"><font style="{font-size: 8pt;}">{L_POSTED}: {postrow.POST_DATE}</font></td>
 	       </tr>
 	       <tr bgcolor="{postrow.ROW_COLOR}" class="tablebody">
-	       	 <td colspan="3">
-						  {postrow.MESSAGE}<hr>
+	       	 <td colspan="3">{postrow.MESSAGE}<hr>
                     {postrow.PROFILE_IMG}&nbsp;{postrow.EMAIL_IMG}&nbsp;{postrow.WWW_IMG}&nbsp;{postrow.ICQ_STATUS_IMG}&nbsp;{postrow.ICQ_ADD_IMG}&nbsp;{postrow.AIM_IMG}&nbsp;{postrow.YIM_IMG}&nbsp;{postrow.MSN_IMG}&nbsp;<img src="images/div.gif">&nbsp;{postrow.EDIT_IMG}&nbsp;{postrow.QUOTE_IMG}&nbsp;{postrow.PMSG_IMG}&nbsp;<img src="images/div.gif">&nbsp;{postrow.IP_IMG}&nbsp;{postrow.DELPOST_IMG}
              </td>
           </tr>