diff --git a/src/chat_control.py b/src/chat_control.py
index a3b9dc4cd..aafb12466 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1273,17 +1273,12 @@ class ChatControl(ChatControlBase):
 			# Translate standard subactivities
 
 			if HAVE_MARKUP_TOOLTIPS:
-				activity = gobject.markup_escape_text(activity)
-				subactivity = gobject.markup_escape_text(
-					subactivity)
-
-				tooltip = '<b>' + activity
+				tooltip = '<b>' + gobject.markup_escape_text(activity)
 				if subactivity:
-					tooltip += ': ' + subactivity
+					tooltip += ': ' + gobject.markup_escape_text(subactivity)
 				tooltip += '</b>'
 				if text:
-					text = gobject.markup_escape_text(text)
-					tooltip += '\n' + text
+					tooltip += '\n' + gobject.markup_escape_text(text)
 				self._activity_image.set_tooltip_markup(tooltip)
 			else:
 				tooltip = activity
@@ -1297,7 +1292,6 @@ class ChatControl(ChatControlBase):
 		else:
 			self._activity_image.hide()
 
-
 	def update_tune(self):
 		artist = None
 		title  = None
@@ -2604,4 +2598,4 @@ class ChatControl(ChatControlBase):
 			self.print_conversation('%s' % (status), 'status', simple=True)
 			self.print_conversation(')', 'status', simple=True)
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3: