diff --git a/js/views/message.js b/js/views/message_view.js
similarity index 100%
rename from js/views/message.js
rename to js/views/message_view.js
diff --git a/popup.html b/popup.html
index f19364427..fb494cd73 100644
--- a/popup.html
+++ b/popup.html
@@ -83,7 +83,7 @@
 
 	<script type="text/javascript" src="js/chromium.js"></script>
 	<script type="text/javascript" src="js/views/notifications.js"></script>
-	<script type="text/javascript" src="js/views/message.js"></script>
+	<script type="text/javascript" src="js/views/message_view.js"></script>
 	<script type="text/javascript" src="js/views/conversations/show.js"></script>
 	<script type="text/javascript" src="js/views/conversations/index.js"></script>
 	<script type="text/javascript" src="js/views/conversations/new.js"></script>