3 files changed, 14 insertions, 17 deletions
diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade
index cb01cdc1..c910b052 100644
--- a/client/components/main/editor.jade
+++ b/client/components/main/editor.jade
@@ -5,3 +5,9 @@ template(name="editor")
     autofocus=autofocus
     placeholder="{{_ 'comment-placeholder'}}")
     +Template.contentBlock
+
+template(name="viewer")
+  +mentions
+    +emoji
+      +markdown
+        {{> UI.contentBlock }}
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index d1ea36b5..8e6ae941 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -16,3 +16,11 @@ template(name="defaultLayout")
     #content
       +yield
 
+template(name="notfound")
+  +message(label='page-not-found')
+
+template(name="message")
+  .big-message.quiet(class=color)
+    h1 {{_ label}}
+    with(pathFor route='atSignIn')
+      p {{{_ 'page-maybe-private' this}}}
diff --git a/client/components/main/templates.html b/client/components/main/templates.html
deleted file mode 100644
index 876eb13a..00000000
--- a/client/components/main/templates.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<template name="notfound">
-    {{ > message label='page-not-found'}}
-</template>
-
-<template name='message'>
-    <div class="big-message quiet {{ color }}">
-        <h1>{{_ label}}</h1>
-        {{#with pathFor route='atSignIn'}}
-            <p>{{{_ 'page-maybe-private' this}}}</p>
-        {{/with}}
-    </div>
-</template>
-
-<!-- XXX This should be moved to editor.jade but there is an issue with jade
-     handling of the markdown component. -->
-
-<template name="viewer">{{#markdown}}{{#emoji}}{{#mentions}}{{> UI.contentBlock }}{{/mentions}}{{/emoji}}{{/markdown}}</template>