diff --git a/controllers/threads.php b/controllers/threads.php
index 2daf26b..6a5d805 100644
--- a/controllers/threads.php
+++ b/controllers/threads.php
@@ -35,17 +35,24 @@ public function _new() {
     SC::loginRequired();
     global $current_user;
 
+    $type = $_GET["type"] or $type = "text";
+    $parent = new SCBoard($_GET["boardid"]);
+    $route_params = array("boardid"=>$parent->boardid);
+
     $vars = array(
       "subject"=>SC::getParam("subject", true),
       "text"=>SC::getParam("text", true),
-      "boardid"=>$_GET["boardid"],
-      "board"=>new SCBoard($_GET["boardid"])
+      "type"=>$type,
+      "parent"=>$parent,
+      "controller"=>"threads",
+      "route_params"=>$route_params,
+      "action"=>SCRoutes::set("threads", "create", $route_params)
     );
 
     switch ($_GET["__content_type"]) {
       case "json":
         $output = array(
-          "content"=>SCPartial::renderToString("thread/new", $vars)
+          "content"=>SCPartial::renderToString("message/new", $vars)
         );
         echo SC::jsonify($output);
         break;
@@ -56,7 +63,7 @@ public function _new() {
           "title"=>"Create Thread",
           "head"=>SCPartial::renderToString("shared/head"),
           "util_links"=>SCPartial::renderToString("board/newthread_util_links", $vars),
-          "content"=>SCPartial::renderToString("thread/new", $vars)
+          "content"=>SCPartial::renderToString("message/new", $vars)
         );
 
         SCLayout::render("main", $vars, $cs);
diff --git a/partials/thread/_new.php b/partials/thread/_new.php
index 1d3f15b..e69de29 100644
--- a/partials/thread/_new.php
+++ b/partials/thread/_new.php
@@ -1,36 +0,0 @@
-<form id="createthread" method="POST" action="<?php echo SCRoutes::set("threads", "create", array("boardid"=>$boardid)); ?>">
-  <p>
-    <label for="thread_create_subject">Subject:</label>
-    <input type="text" id="thread_create_subject" name="subject" value="<?php echo $subject; ?>" />
-  </p>
-  <p>
-    <label for="thread_create_text">Message:</label>
-    <textarea id="thread_create_text" name="text" rows="5" cols="50"><?php echo $text; ?></textarea>
-  </p>
-  <p>
-    <label for="thread_create_type">Type:</label>
-    <select id="thread_create_type" name="type">
-      <option value="text">Text</option>
-      <option value="image">Image</option>
-      <option value="video">Video</option>
-      <option value="link">Link</option>
-    </select>
-  </p>
-  <p>
-    <label for="thread_create_url">Url:</label>
-    <input type="text" id="thread_create_url" name="url" />
-  </p>
-  <p>
-    <label for="thread_create_caption">Caption:</label>
-    <input type="text" id="thread_create_caption" name="caption" />
-  </p>
-  <p>
-    <label for="thread_create_upload_image">Upload Image:</label>
-    <input id="thread_create_upload_image" type="file" name="uploadmedia" />
-    <a href="mailto:<?php echo $board->emailAddress(); ?>"><?php echo $board->emailAddress(); ?></a>
-  </p>
-  <p>
-    <input type="hidden" name="method" value="PUT" />
-    <input type="submit" id="btn_create" value="Create" />
-  </p>
-</form>