diff --git a/pastebin/apps/dpaste/models.py b/pastebin/apps/dpaste/models.py
index 7675df3..a4192e7 100644
--- a/pastebin/apps/dpaste/models.py
+++ b/pastebin/apps/dpaste/models.py
@@ -46,7 +46,7 @@ class Snippet(models.Model):
     def __unicode__(self):
         return '%s' % self.secret_id
 
-#mptt.register(Snippet, order_insertion_by=['content'])
+mptt.register(Snippet, order_insertion_by=['content'])
 
 
 class SpamwordManager(models.Manager):
diff --git a/pastebin/apps/dpaste/templates/dpaste/snippet_details.html b/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
index 39f4274..bdbd3f0 100644
--- a/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
+++ b/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
@@ -56,19 +56,16 @@
         </div>
     </div>
 
-    {% comment %}
     <h2>{% trans "Write an answer" %} &rarr;</h2>
     <div class="container" style="display: none;">
         {% include "dpaste/snippet_form.html" %}
     </div>
-    {% endcomment %}
 </div>
 {% endblock %}
 
 
 
 {% block sidebar %}
-{% comment %}
     <h2>{% trans "History" %}</h2>
 
     <form method="get" id="diffform" action="{% url snippet_diff %}">
@@ -94,7 +91,6 @@
         </div>
     </div>
     </form>
-{% endcomment %}
 
     <h2>{% trans "Options" %}</h2>
     <p><a href="{% url snippet_details_raw snippet.secret_id %}">{% trans "View raw" %}</a></p>
diff --git a/pastebin/apps/dpaste/views.py b/pastebin/apps/dpaste/views.py
index 520128f..186073c 100644
--- a/pastebin/apps/dpaste/views.py
+++ b/pastebin/apps/dpaste/views.py
@@ -36,8 +36,8 @@ def snippet_details(request, snippet_id, template_name='dpaste/snippet_details.h
 
     snippet = get_object_or_404(Snippet, secret_id=snippet_id)
 
-    #tree = snippet.get_root()
-    #tree = tree.get_descendants(include_self=True)
+    tree = snippet.get_root()
+    tree = tree.get_descendants(include_self=True)
 
     new_snippet_initial = {
         'content': snippet.content,
@@ -56,7 +56,7 @@ def snippet_details(request, snippet_id, template_name='dpaste/snippet_details.h
         'snippet_form': snippet_form,
         'snippet': snippet,
         'lines': range(snippet.get_linecount()),
-        #'tree': tree,
+        'tree': tree,
     }
 
     response = render_to_response(