diff --git a/src/chat_control.py b/src/chat_control.py
index 08b90120c..4998d83cd 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -1101,8 +1101,10 @@ class ChatControl(ChatControlBase):
 			self.parent_win.get_active_control() != self:
 				color = self.lighten_color(color)
 
-		label_str = gtkgui_helpers.escape_for_pango_markup(
-			self.contact.get_shown_name())
+		name = self.contact.get_shown_name()
+		if self.resource:
+			name += '/' + self.resource
+		label_str = gtkgui_helpers.escape_for_pango_markup(name)
 		if num_unread: # if unread, text in the label becomes bold
 			label_str = '<b>' + unread + label_str + '</b>'
 		return (label_str, color)
diff --git a/src/message_window.py b/src/message_window.py
index d325e123d..2e853a72f 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -222,6 +222,8 @@ class MessageWindow:
 			urgent = control.attention_flag
 		else:
 			name = control.contact.get_shown_name()
+			if control.resource:
+				name += '/' + control.resource
 
 		window_mode = gajim.interface.msg_win_mgr.mode
 		if self.get_num_controls() == 1: