diff --git a/boards/mdx_neboard.py b/boards/mdx_neboard.py
--- a/boards/mdx_neboard.py
+++ b/boards/mdx_neboard.py
@@ -19,7 +19,7 @@ class QuotePattern(Pattern):
     def handleMatch(self, m):
         quote_element = etree.Element('span')
         quote_element.set('class', 'quote')
-        quote_element.text = m.group(3)
+        quote_element.text = m.group(2)
 
         return quote_element
 
@@ -29,7 +29,7 @@ class ReflinkPattern(Pattern):
         ref_element = etree.Element('a')
         post_id = m.group(4)
         ref_element.set('href', '#' + str(post_id))
-        ref_element.text = '#' + post_id
+        ref_element.text = m.group(2)
 
         return ref_element
 
@@ -54,8 +54,8 @@ class CommentPattern(Pattern):
 
 class NeboardMarkdown(markdown.Extension):
     AUTOLINK_PATTERN = r'(https?://\S+)'
-    QUOTE_PATTERN = r'^(>){1}(.+)'
-    REFLINK_PATTERN = r'((>){2}(\d+))'
+    QUOTE_PATTERN = r'^(?<!>)(>[^>]+)$'
+    REFLINK_PATTERN = r'((>>)(\d+))'
     SPOILER_PATTERN = r'%%(.+)%%'
     COMMENT_PATTERN = r'^(//(.+))'
 
@@ -67,10 +67,12 @@ class NeboardMarkdown(markdown.Extension
         comment = CommentPattern(self.COMMENT_PATTERN, md)
 
         md.inlinePatterns[u'autolink_ext'] = autolink
-        md.inlinePatterns.add(u'reflink', reflink, '<entity')
-        md.inlinePatterns.add(u'quote', quote, '<entity')
         md.inlinePatterns[u'spoiler'] = spoiler
         md.inlinePatterns[u'comment'] = comment
+        md.inlinePatterns[u'reflink'] = reflink
+        md.inlinePatterns[u'quote'] = quote
+
+        del md.parser.blockprocessors['quote']
 
 
 def makeExtension(configs=None):
@@ -80,4 +82,4 @@ neboard_extension = makeExtension()
 
 
 def markdown_extended(markup):
-    return markdown.markdown(markup, [neboard_extension])
+    return markdown.markdown(markup, [neboard_extension], safe_mode=True)
diff --git a/boards/models.py b/boards/models.py
--- a/boards/models.py
+++ b/boards/models.py
@@ -211,7 +211,7 @@ class Post(models.Model):
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
-                       escape_html=True)
+                       escape_html=False)
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,))
     poster_ip = models.IPAddressField()
diff --git a/boards/static/css/md/base_page.css b/boards/static/css/md/base_page.css
--- a/boards/static/css/md/base_page.css
+++ b/boards/static/css/md/base_page.css
@@ -189,9 +189,8 @@ blockquote {
 }
 
 .quote {
-    color: greenyellow;
+    color: #92cf38;
     padding-left: 5px;
-    border-left: solid 2px greenyellow;
 }
 
 .spoiler {
@@ -204,7 +203,7 @@ blockquote {
 }
 
 .comment {
-    color: darkseagreen;
+    color: #5dbcb7;
 }
 
 a:hover {