diff --git a/background.html b/background.html
index 62d72fed..62f90d90 100644
--- a/background.html
+++ b/background.html
@@ -118,7 +118,7 @@
       {{> avatar }}
       <div class='contact-details'> {{> contact_name_and_number }} </div>
   </script>
-  <script type='text/x-tmpl-mustache' id='conversation_preview'>
+  <script type='text/x-tmpl-mustache' id='conversation-preview'>
       {{> avatar }}
       <div class='contact-details'>
           {{> contact_name_and_number }}
diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
index 3472e400..cd379c2c 100644
--- a/js/views/conversation_list_item_view.js
+++ b/js/views/conversation_list_item_view.js
@@ -21,7 +21,7 @@
     Whisper.ConversationListItemView = Whisper.View.extend({
         tagName: 'div',
         className: 'conversation-list-item contact',
-        template: Whisper.View.Templates.conversation_preview,
+        templateName: 'conversation-preview',
         events: {
             'click': 'select'
         },
@@ -40,7 +40,7 @@
 
         render: function() {
             this.$el.html(
-                Mustache.render(this.template, {
+                Mustache.render(_.result(this,'template', ''), {
                     title: this.model.getTitle(),
                     last_message: this.model.get('lastMessage'),
                     last_message_timestamp: moment(this.model.get('timestamp')).format('MMM D'),