diff --git a/data/static/style.css b/data/static/style.css
index 0cc6787..cf59b4c 100644
--- a/data/static/style.css
+++ b/data/static/style.css
@@ -154,6 +154,14 @@ pre code {
   margin-right: 10px;
 }
 
+blockquote {
+  padding: 10px 20px;
+  margin: 10px;
+  border-radius: 4px;
+  border-left: 10px solid rgb(229.84, 231.92, 227.28);
+  background-color: rgb(135.1928346457, 145.0974015748, 123.0025984252);
+}
+
 .user-posts {
   display: grid;
   grid-template-columns: 200px 1fr;
diff --git a/lib/babycode.lua b/lib/babycode.lua
index e8ea09d..7d4e8ef 100644
--- a/lib/babycode.lua
+++ b/lib/babycode.lua
@@ -37,6 +37,8 @@ function babycode.to_html(s, escape_html)
   text = text:gsub("%[b%](.-)%[/b%]", "<strong>%1</strong>")
   text = text:gsub("%[i%](.-)%[/i%]", "<em>%1</em>")
   text = text:gsub("%[s%](.-)%[/s%]", "<del>%1</del>")
+  
+  text = text:gsub("%[quote%](.-)%[/quote%]", "<blockquote>%1</blockquote>")
 
   -- replace loose links
   text = text:gsub("(https?://[%w-_%.%?%.:/%+=&~%@#%%]+[%w-/])", function(url)
diff --git a/sass/style.scss b/sass/style.scss
index 1faf595..c6ad205 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -192,6 +192,14 @@ pre code {
   margin-right: 10px;
 }
 
+blockquote {
+  padding: 10px 20px;
+  margin: 10px;
+  border-radius: 4px;
+  border-left: 10px solid $lighter;
+  background-color: $dark2;
+}
+
 .user-posts {
   display: grid;
   grid-template-columns: 200px 1fr;
diff --git a/views/threads/post.etlua b/views/threads/post.etlua
index 681ab63..3c05c6d 100644
--- a/views/threads/post.etlua
+++ b/views/threads/post.etlua
@@ -17,45 +17,51 @@
 
   <div class="post-content-container"<%= is_latest and 'id=latest-post' or "" %>>
     <div class="post-info">
-        <a href="<%= url_for("thread", {slug = thread.slug}, {page = page}) .. "#post-" .. post.id %>" title="Permalink"><i>
-          <% if tonumber(post.edited_at) > tonumber(post.created_at) then -%>
-            Edited at <%= os.date("%c", post.edited_at) %>
-          <% else -%>
-            Posted at <%= os.date("%c", post.created_at) %>
-          <% end -%>
-        </i></a>
-        <span>
-        <%
-          local show_edit = me.id == post.user_id and not me:is_guest() and not ntob(thread.is_locked) and not no_reply
-          if show_edit then
+      <%
+        local post_url = url_for("thread", {slug = thread.slug}, {page = page}) .. "#post-" .. post.id
+      %>
+      <a href="<%= post_url %>" title="Permalink"><i>
+        <% if tonumber(post.edited_at) > tonumber(post.created_at) then -%>
+          Edited at <%= os.date("%c", post.edited_at) %>
+        <% else -%>
+          Posted at <%= os.date("%c", post.created_at) %>
+        <% end -%>
+      </i></a>
+      <span>
+      <%
+        local show_edit = me.id == post.user_id and not me:is_guest() and not ntob(thread.is_locked) and not no_reply
+        if show_edit then
+      %>
+          <a class="linkbutton" href="<%= url_for("edit_post", {post_id = post.id}) %>">Edit</a>
+      <% end %>
+      <%
+        local show_reply = true
+        if ntob(thread.is_locked) and not me:is_mod() then
+          show_reply = false
+        elseif me:is_guest() then
+          show_reply = false
+        elseif edit then
+          show_reply = false
+        elseif no_reply then
+          show_reply = false
+        end
+        if show_reply then
+          local d = post.created_at < post.edited_at and post.edited_at or post.created_at
+          local quote_src_text = ("On [url=%s]%s[/url], [url=%s]%s[/url] said:"):format(
+            post_url, os.date("%c", d), url_for("user", {username = post.username}), post.username
+          )
+          local reply_text = ("%s\n[quote]%s[/quote]\n---\n\n"):format(quote_src_text, post.original_markup)
         %>
-            <a class="linkbutton" href="<%= url_for("edit_post", {post_id = post.id}) %>">Edit</a>
+          <button value="<%= reply_text %>" class="reply-button">Reply</button>
         <% end %>
-        <%
-          local show_reply = true
-          if ntob(thread.is_locked) and not me:is_mod() then
-            show_reply = false
-          elseif me:is_guest() then
-            show_reply = false
-          elseif edit then
-            show_reply = false
-          elseif no_reply then
-            show_reply = false
-          end
-          if show_reply then
-            local d = post.created_at < post.edited_at and post.edited_at or post.created_at
-            local reply_text = ("On %s, %s said:\n%s\n\n---\n\n"):format(os.date("%c", d), post.username, post.original_markup)
-          %>
-            <button value="<%= reply_text %>" class="reply-button">Reply</button>
-          <% end %>
-        </span>
+      </span>
     </div>
     <div class="post-content">
       <% if not edit then %>
         <%- post.content %>
       <% else %>
         <% render("views.common.babycode-editor", {
-          cancel_url = url_for("thread", {slug = thread.slug}, {page = page}) .. "#post-" .. post.id,
+          cancel_url = post_url,
           prefill = post.original_markup,
           ta_name = "new_content"
           }) %>