diff --git a/boards/mdx_neboard.py b/boards/mdx_neboard.py
--- a/boards/mdx_neboard.py
+++ b/boards/mdx_neboard.py
@@ -77,6 +77,7 @@ class CommentPattern(TextFormatter):
     format_right = '[/comment]'
 
 
+# TODO Use <s> tag here
 class StrikeThroughPattern(TextFormatter):
     name = 's'
     preview_left = '<span class="strikethrough">'
@@ -128,6 +129,20 @@ def render_reflink(tag_name, value, opti
         return u'>>%s' % value
 
 
+def render_quote(tag_name, value, options, parent, context):
+    source = u''
+    if 'source' in options:
+        source = options['source']
+
+    result = u''
+    if source:
+        result = u'<div class="multiquote"><div class="quote-header">%s</div><div class="quote-text">%s</div></div>' % (source, value)
+    else:
+        result = u'<div class="multiquote"><div class="quote-text">%s</div></div>' % value
+
+    return result
+
+
 def preparse_text(text):
     """
     Performs manual parsing before the bbcode parser is used.
@@ -139,8 +154,7 @@ def preparse_text(text):
 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>', strip=True)
+    parser.add_formatter('quote', render_quote, strip=True)
     parser.add_simple_formatter('comment',
             u'<span class="comment">//%(value)s</span>')
     parser.add_simple_formatter('spoiler',
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
@@ -430,6 +430,14 @@ ul {
     padding-left: 0px;
 }
 
+.quote-header {
+    border-bottom: 2px solid #ddd;
+    margin-bottom: 1ex;
+    padding-bottom: .5ex;
+    color: #ddd;
+    font-size: 1.2em;
+}
+
 /* Reflink preview */
 .post_preview {
     border-left: 1px solid #777;