diff --git a/remarkbox/templates/snippets/create.j2 b/remarkbox/templates/snippets/create.j2
index a4cff25..5ba1b5a 100644
--- a/remarkbox/templates/snippets/create.j2
+++ b/remarkbox/templates/snippets/create.j2
@@ -11,10 +11,24 @@
         name        = "thread_data"
         id          = "thread_data_textarea"
         class       = "common-textarea"
+        data-source-format = "markdown"
         onkeyup     = "previewAjax( 'thread_data_textarea', 'preview', show_raw=true, mathjax={{ request.mathjax }} )"
         placeholder = "What do you want to say? markdown"
         required></textarea>
 
+  <label for="source_format_select" style="display:inline-block;margin-right:0.5em">format:</label>
+  <select id="source_format_select" name="source_format"
+          onchange="document.getElementById('thread_data_textarea').dataset.sourceFormat = this.value; previewAjax('thread_data_textarea', 'preview', show_raw=true, mathjax={{ request.mathjax }})">
+    <option value="markdown" selected>markdown</option>
+    <option value="rst">reStructuredText</option>
+    <option value="html">html</option>
+    <option value="mediawiki">mediawiki</option>
+    <option value="latex">latex</option>
+    <option value="org">org</option>
+    <option value="asciidoc">asciidoc</option>
+    <option value="textile">textile</option>
+  </select>
+
   <div id='preview' name='preview' class="preview"></div>
 
 {% include 'csrf.j2' %}
diff --git a/remarkbox/views/new_thread.py b/remarkbox/views/new_thread.py
index e088250..2e0f914 100644
--- a/remarkbox/views/new_thread.py
+++ b/remarkbox/views/new_thread.py
@@ -22,6 +22,7 @@ def new_thread(request):
     thread_title = request.params.get("thread_title", "")
     thread_data = request.params.get("thread_data", "")
     anonymous_name = request.params.get("anonymous_name", "").strip()
+    source_format = request.params.get("source_format", "").strip() or None
 
     if request.spam:
         return request.spam
@@ -61,7 +62,7 @@ def new_thread(request):
         node.namespace = request.namespace
         node.ip_address = unicode(request.client_addr)
         node.title = thread_title
-        node.set_data(thread_data, dbsession=request.dbsession)
+        node.set_data(thread_data, dbsession=request.dbsession, source_format=source_format)
 
         # Handle anonymous vs authenticated user
         if user_surrogate: