diff --git a/src/chat.py b/src/chat.py
index 9e4bbbdec..790aed825 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -840,7 +840,7 @@ class Chat:
 		urgent = True
 		if (jid != self.get_active_jid() or \
 		   not self.window.is_active() or \
-		   not end) and kind == 'incoming':
+		   not end) and kind in ('incoming', 'incoming_queue'):
 			if self.widget_name == 'groupchat_window':
 				if text.find(self.nicks[jid]) == -1:
 					# Do not notify us for gc messages that are not for us
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 465ac2a34..e288f25ba 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -846,7 +846,7 @@ class TabbedChatWindow(chat.Chat):
 			typ = 'pm'
 
 		gajim.interface.roster.draw_contact(jid, self.account)
-		if gajim.interface.systray_enabled:
+		if jid == self.get_active_jid() and gajim.interface.systray_enabled:
 			gajim.interface.systray.remove_jid(jid, self.account, typ)
 		showOffline = gajim.config.get('showoffline')
 		if (contact.show == 'offline' or contact.show == 'error') and \