diff --git a/boards/mdx_neboard.py b/boards/mdx_neboard.py
--- a/boards/mdx_neboard.py
+++ b/boards/mdx_neboard.py
@@ -130,7 +130,7 @@ def bbcode_extended(markup):
     parser = bbcode.Parser()
     parser.add_formatter('post', render_reflink, strip=True)
     parser.add_simple_formatter('quote',
-            u'<span class="multiquote">%(value)s</span>')
+            u'<span class="multiquote">%(value)s</span>', strip=True)
     parser.add_simple_formatter('comment',
             u'<span class="comment">//%(value)s</span>')
     parser.add_simple_formatter('spoiler',
diff --git a/boards/models/post.py b/boards/models/post.py
--- a/boards/models/post.py
+++ b/boards/models/post.py
@@ -36,7 +36,7 @@ NO_IP = '0.0.0.0'
 # TODO Real user agent should be saved instead of this
 UNKNOWN_UA = ''
 
-REGEX_REPLY = re.compile(r'&gt;&gt;(\d+)')
+REGEX_REPLY = re.compile(ur'\[post\](\d+)\[/post\]')
 
 logger = logging.getLogger(__name__)
 
@@ -119,7 +119,7 @@ class PostManager(models.Manager):
         Connects replies to a post to show them as a reflink map
         """
 
-        for reply_number in re.finditer(REGEX_REPLY, post.text.rendered):
+        for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
             post_id = reply_number.group(1)
             ref_post = self.filter(id=post_id)
             if ref_post.count() > 0: