diff --git a/src/message_window.py b/src/message_window.py
index 5b27ee421..9e4bc725c 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -165,7 +165,7 @@ class MessageWindow(object):
 		if old_jid not in self._controls[account]:
 			return
 		self._controls[account][new_jid] = self._controls[account][old_jid]
-			del self._controls[account][old_jid]
+		del self._controls[account][old_jid]
 
 	def get_num_controls(self):
 		return sum(len(d) for d in self._controls.values())