diff --git a/src/common/gajim.py b/src/common/gajim.py
index 2f25f79ea332cc67effb5c247c3c9266e164afdc..e138938a153266bbc0978b8857830a2a6ce11be2 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -230,8 +230,6 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
 	host = jid.split('@')[-1]
 	if host.startswith('aim'):
 		return 'aim'
-	elif host.startswith('gadugadu'):
-		return 'gadugadu'
 	elif host.startswith('gg'):
 		return 'gadugadu'
 	elif host.startswith('irc'):
@@ -253,14 +251,14 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
 		return None
 
 def jid_is_transport(jid):
-	aim = jid.startswith('aim.')
-	gg = jid.startswith('gg.') # gadugadu
-	irc = jid.startswith('irc.')
-	icq = jid.startswith('icq.')
-	msn = jid.startswith('msn.')
-	sms = jid.startswith('sms.')
-	tlen = jid.startswith('tlen.')
-	yahoo = jid.startswith('yahoo.')
+	aim = jid.startswith('aim')
+	gg = jid.startswith('gg') # gadugadu
+	irc = jid.startswith('irc')
+	icq = jid.startswith('icq')
+	msn = jid.startswith('msn')
+	sms = jid.startswith('sms')
+	tlen = jid.startswith('tlen')
+	yahoo = jid.startswith('yahoo')
 
 	if aim or gg or irc or icq or msn or sms or yahoo or tlen:
 		is_transport = True