diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html
index 3097061..f7c2d17 100644
--- a/brutaldon/templates/main/toot_partial.html
+++ b/brutaldon/templates/main/toot_partial.html
@@ -33,7 +33,7 @@
                 </p>
             {% endif %}
             <div class="toot">
-                {{ toot.content |relink_toot | strip_html | safe }}
+                {{ toot.content | strip_html |relink_toot | safe }}
             </div>
 
             {% if toot.media_attachments %}
diff --git a/brutaldon/templatetags/taglinks.py b/brutaldon/templatetags/taglinks.py
index d883b78..fc3741a 100644
--- a/brutaldon/templatetags/taglinks.py
+++ b/brutaldon/templatetags/taglinks.py
@@ -18,7 +18,7 @@ def relink_tags(value):
     soup = BeautifulSoup(value, 'html.parser')
     for link in soup.find_all('a', class_='hashtag'):
         link['href'] = reverse('tag', args=[link.span.string])
-    return str(soup)
+    return soup.prettify(formatter=None)
 
 @register.filter
 def relink_toot(value):