diff --git a/src/roster_window.py b/src/roster_window.py
index 06bd89eb4..387c274d0 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -189,19 +189,19 @@ class Roster_window:
 
 		host = jid.split('@')[-1]
 
-		if host.startswith('aim.'):
+		if host.startswith('aim'):
 			state_images = self.transports_state_images['aim']
-		elif host.startswith('gadugadu.'):
+		elif host.startswith('gadugadu'):
 			state_images = self.transports_state_images['gadugadu']
-		elif host.startswith('irc.'):
+		elif host.startswith('irc'):
 			state_images = self.transports_state_images['irc']
-		elif host.startswith('icq.'):
+		elif host.startswith('icq'): # abc@icqsucks.org will match as ICQ, but what to do..
 			state_images = self.transports_state_images['icq']
-		elif host.startswith('msn.'):
+		elif host.startswith('msn'):
 			state_images = self.transports_state_images['msn']
-		elif host.startswith('sms.'):
+		elif host.startswith('sms'):
 			state_images = self.transports_state_images['sms']
-		elif host.startswith('yahoo.'):
+		elif host.startswith('yahoo'):
 			state_images = self.transports_state_images['yahoo']
 		else:
 			state_images = self.jabber_state_images