diff --git a/index.html b/index.html
index ae9b2b7da2..da54265b3d 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,7 @@
             <div id='contacts'></div>
         </div>
         <script type='text/x-tmpl-mustache' id='conversation'>
-            <div class='discussion-container'></ul>
+            <div class='discussion-container'></div>
             <div class='send-message-area'>
                 <div class='message-composer'>
                     <form class='send'>
diff --git a/js/models/threads.js b/js/models/threads.js
index dab1740b99..090f34b7c4 100644
--- a/js/models/threads.js
+++ b/js/models/threads.js
@@ -61,7 +61,11 @@ var Whisper = Whisper || {};
   Whisper.Threads = new (Backbone.Collection.extend({
     localStorage: new Backbone.LocalStorage("Threads"),
     model: Thread,
-    comparator: 'timestamp',
+
+    comparator: function(m) {
+      return -m.get('timestamp');
+    },
+
     findOrCreate: function(attributes) {
       var thread = Whisper.Threads.add(attributes, {merge: true});
       thread.save();
@@ -112,5 +116,6 @@ var Whisper = Whisper || {};
       }
       return this.findOrCreate(attributes);
     }
+
   }))();
 })();
diff --git a/test/test_views.html b/test/test_views.html
index b86579e2ad..6ced2533f8 100644
--- a/test/test_views.html
+++ b/test/test_views.html
@@ -149,7 +149,8 @@
 
 	<script type="text/javascript" src="test.js"></script>
 	<script type="text/javascript" src="views/message_view_test.js"></script>
-	<script type="text/javascript" src="views/list_view_test.js"></script>
+  <script type="text/javascript" src="views/list_view_test.js"></script>
+	<script type="text/javascript" src="views/threads_test.js"></script>
 
 
 </body>
diff --git a/test/views/threads_test.js b/test/views/threads_test.js
new file mode 100644
index 0000000000..c68b738765
--- /dev/null
+++ b/test/views/threads_test.js
@@ -0,0 +1,22 @@
+describe('Threads', function() {
+
+  it('should be ordered newest to oldest', function() {
+    // Timestamps
+    var today = new Date();
+    var tomorrow = new Date();
+    tomorrow.setDate(today.getDate()+1);
+
+    // Add threads
+    Whisper.Threads.add({ timestamp: today });
+    Whisper.Threads.add({ timestamp: tomorrow });
+
+    var models = Whisper.Threads.models;
+    var firstTimestamp = models[0].get('timestamp').getTime();
+    var secondTimestamp = models[1].get('timestamp').getTime();
+
+    // Compare timestamps
+    assert(firstTimestamp > secondTimestamp);
+  });
+
+
+});