diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index fe079f1e6dc1b32bccce3aa1e002afe1af925453..de00a3b19b56f240c46f22c804fe84a1c16fa0fa 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -341,6 +341,7 @@ class GroupchatWindow(chat.Chat):
 	def set_subject(self, room_jid, subject):
 		self.subjects[room_jid] = subject
 		name_label = self.name_labels[room_jid]
+		subject = gtkgui_helpers.escape_for_pango_markup(subject)
 		name_label.set_markup('<span weight="heavy" size="x-large">%s</span>\n%s' % (room_jid, subject))
 		event_box = name_label.get_parent()
 		if subject == '':
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 26d611b2b8a654269cc753144e010161ad94fb6d..eb0fcea5d3fc384275f19bf540d8e3e788eaf003 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -21,6 +21,7 @@
 ##
 
 import xml.sax.saxutils
+import gtk
 
 def escape_for_pango_markup(string):
 	# escapes < > & \ "