2 files changed, 23 insertions, 2 deletions
diff --git a/lib/render-msg.js b/lib/render-msg.js
index 0c53894..48a5777 100644
--- a/lib/render-msg.js
+++ b/lib/render-msg.js
@@ -147,7 +147,11 @@ RenderMsg.prototype.actions = function () {
         h('a', {href: '?gt=' + this.msg.timestamp}, '↓'), ' '] : '',
       this.c.type === 'gathering' ? [
         h('a', {href: this.render.toUrl('/about/' + encodeURIComponent(this.msg.key))}, 'about'), ' '] : '',
-      h('a', {href: this.toUrl(this.msg.key) + '?raw'}, 'raw'), ' ',
+      typeof this.c.text === 'string' ? [
+        h('a', {href: this.toUrl(this.msg.key) + '?raw=md',
+          title: 'view markdown source'}, 'md'), ' '] : '',
+      h('a', {href: this.toUrl(this.msg.key) + '?raw',
+        title: 'view raw message'}, 'raw'), ' ',
       this.buttonsCommon(),
       this.c.type === 'gathering' ? [this.attendButton(), ' '] : '',
       this.voteButton('dig')
@@ -246,9 +250,21 @@ RenderMsg.prototype.encrypted = function (cb) {
 }
 
 RenderMsg.prototype.markdown = function (cb) {
+  if (this.opts.markdownSource)
+    return this.markdownSource(this.c.text, this.c.mentions)
   return this.render.markdown(this.c.text, this.c.mentions)
 }
 
+RenderMsg.prototype.markdownSource = function (text, mentions) {
+  return h('div',
+    h('pre', String(text)),
+    mentions ? [
+      h('div', h('em', 'mentions:')),
+      this.valueTable(mentions, function () {})
+    ] : ''
+  ).innerHTML
+}
+
 RenderMsg.prototype.post = function (cb) {
   var self = this
   var done = multicb({pluck: 1, spread: true})
diff --git a/lib/serve.js b/lib/serve.js
index 98a34e0..4481439 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -1079,8 +1079,13 @@ Serve.prototype.renderThreadPaginated = function (opts, feedId, q) {
 }
 
 Serve.prototype.renderRawMsgPage = function (id) {
+  var showMarkdownSource = (this.query.raw === 'md')
+  var raw = !showMarkdownSource
   return pull(
-    this.app.render.renderFeeds(true),
+    this.app.render.renderFeeds({
+      raw: raw,
+      markdownSource: showMarkdownSource
+    }),
     pull.map(u.toHTML),
     this.wrapMessages(),
     this.wrapPage(id)