diff --git a/js/views/messagesview.js b/js/views/messagesview.js
index 31c795646de104274137f4cf2200cd9e0e25788e..f65d566886d888c8725b882df927c21c85cd4918 100644
--- a/js/views/messagesview.js
+++ b/js/views/messagesview.js
@@ -96,21 +96,13 @@ define(function(require) {
 		 * @param {Message} message
 		 */
 		setActiveMessage: function(message) {
-			var oldMessage = null;
 			if (this.currentMessage !== null) {
-				// TODO: make sure objects exist only once and compare references instead
-				oldMessage = this.collection.get(this.currentMessage.get('id'));
-				if (oldMessage) {
-					oldMessage.set('active', false);
-				}
+				this.currentMessage.set('active', false);
 			}
 
 			this.currentMessage = message;
 			if (message !== null) {
-				message = this.collection.get(this.currentMessage);
-				if (message) {
-					message.set('active', true);
-				}
+				message.set('active', true);
 			}
 
 			require('state').currentMessage = message;