diff --git a/system/templates/forum.show_thread.html.twig b/system/templates/forum.show_thread.html.twig
index f2c15959..1255dac4 100644
--- a/system/templates/forum.show_thread.html.twig
+++ b/system/templates/forum.show_thread.html.twig
@@ -58,6 +58,7 @@ Page: {{ links_to_pages|raw }}<br/>
 						<a href="?subtopic=forum&action=move_thread&id={{ post.id }}" title="Move Thread"><img src="images/icons/arrow_right.gif"/></a>
 						<a href="?subtopic=forum&action=remove_post&id={{ post.id }}" title="Remove Thread" target="_blank" onclick="return confirm('Are you sure you want remove thread > {{ post.post_topic}} <?')"><img src="images/del.png"/></a>
 					{% endif %}
+				{% endif %}
 					{% if logged and (post.player.getAccount().getId() == account_logged.getId() or is_moderator) %}
 						<a href="?subtopic=forum&action=edit_post&id={{ post.id }}" title="Edit Post" target="_blank">
 							<img src="images/edit.png"/></a>
@@ -65,11 +66,10 @@ Page: {{ links_to_pages|raw }}<br/>
 					{% if logged %}
 						<a href="?subtopic=forum&action=new_post&thread_id={{ thread_id }}&quote={{ post.id }}" title="Quote Post"><img src="images/icons/comment_add.png"/></a>
 					{% endif %}
-				{% endif %}
 			</td>
 		</tr>
 		{% set i = i + 1 %}
 	{% endfor %}
 </table>
 <br/>
-<a href="?subtopic=forum&action=new_post&thread_id={{ thread_id }}"><img src="images/forum/post.gif" border="0" /></a>
\ No newline at end of file
+<a href="?subtopic=forum&action=new_post&thread_id={{ thread_id }}"><img src="images/forum/post.gif" border="0" /></a>