diff --git a/background.html b/background.html
index cf64344dd..c5d338eef 100644
--- a/background.html
+++ b/background.html
@@ -48,8 +48,8 @@
     </a>
     {{ expiredWarning }}
   </script>
-  <script type='text/x-tmpl-mustache' id='expired_toast'>
-    {{ expiredWarning }}
+  <script type='text/x-tmpl-mustache' id='toast'>
+    {{ toastMessage }}
   </script>
   <script type='text/x-tmpl-mustache' id='hint'>
     <p> {{ content }}</p>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 94e3d5fd7..14d2f4391 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -6,11 +6,8 @@
     window.Whisper = window.Whisper || {};
 
     Whisper.ExpiredToast = Whisper.ToastView.extend({
-        templateName: 'expired_toast',
         render_attributes: function() {
-            return {
-                expiredWarning: i18n('expiredWarning')
-            };
+            return { toastMessage: i18n('expiredWarning') };
         }
     });
 
diff --git a/js/views/toast_view.js b/js/views/toast_view.js
index a07c5db1d..d4712a355 100644
--- a/js/views/toast_view.js
+++ b/js/views/toast_view.js
@@ -7,6 +7,7 @@
 
     Whisper.ToastView = Whisper.View.extend({
         className: 'toast',
+        templateName: 'toast',
         initialize: function() {
             this.$el.hide();
         },