diff --git a/data/iconsets/transports/weather/16x16/away.png b/data/iconsets/transports/weather/16x16/away.png
new file mode 100644
index 000000000..73e8e2b73
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/away.png differ
diff --git a/data/iconsets/transports/weather/16x16/chat.png b/data/iconsets/transports/weather/16x16/chat.png
new file mode 100644
index 000000000..655537e02
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/chat.png differ
diff --git a/data/iconsets/transports/weather/16x16/dnd.png b/data/iconsets/transports/weather/16x16/dnd.png
new file mode 100644
index 000000000..12f0b0282
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/dnd.png differ
diff --git a/data/iconsets/transports/weather/16x16/error.png b/data/iconsets/transports/weather/16x16/error.png
new file mode 100644
index 000000000..d99d62a84
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/error.png differ
diff --git a/data/iconsets/transports/weather/16x16/invisible.png b/data/iconsets/transports/weather/16x16/invisible.png
new file mode 100644
index 000000000..b8bb1b870
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/invisible.png differ
diff --git a/data/iconsets/transports/weather/16x16/message.gif b/data/iconsets/transports/weather/16x16/message.gif
new file mode 100644
index 000000000..fea7551cf
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/message.gif differ
diff --git a/data/iconsets/transports/weather/16x16/not_in_the_roster.png b/data/iconsets/transports/weather/16x16/not_in_the_roster.png
new file mode 100644
index 000000000..bdf776ea7
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/not_in_the_roster.png differ
diff --git a/data/iconsets/transports/weather/16x16/offline.png b/data/iconsets/transports/weather/16x16/offline.png
new file mode 100644
index 000000000..334a85c1b
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/offline.png differ
diff --git a/data/iconsets/transports/weather/16x16/online.png b/data/iconsets/transports/weather/16x16/online.png
new file mode 100644
index 000000000..a6bbdedb2
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/online.png differ
diff --git a/data/iconsets/transports/weather/16x16/xa.png b/data/iconsets/transports/weather/16x16/xa.png
new file mode 100644
index 000000000..e38b5889a
Binary files /dev/null and b/data/iconsets/transports/weather/16x16/xa.png differ
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 4a7c72c9d..b967e257b 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -79,16 +79,16 @@ def get_nick_from_jid(jid):
 
 def get_nick_from_fjid(jid):
 	# fake jid is the jid for a contact in a room
-	# gaim@conference.jabber.org/nick/nick-continued
+	# gaim@conference.jabber.no/nick/nick-continued
 	return jid.split('/', 1)[1]
 	
 def get_room_and_nick_from_fjid(jid):
 	# fake jid is the jid for a contact in a room
-	# gaim@conference.jabber.org/nick/nick-continued
-	# return ('gaim@conference.jabber.org', 'nick/nick-continued')
-	l = jid.split('/', 1)
-	if len(l) == 1: #No nick
-		l.append('')
+	# gaim@conference.jabber.no/nick/nick-continued
+	# return ('gaim@conference.jabber.no', 'nick/nick-continued')
+	l = jid.split('/', 1)
+	if len(l) == 1: #No nick
+		l.append('')
 	return l
 
 def get_contact_instances_from_jid(account, jid):
@@ -173,6 +173,8 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
 		return 'sms'
 	elif host.startswith('tlen'):
 		return 'tlen'
+	elif host.startswith('weather'):
+		return 'weather'
 	elif host.startswith('yahoo'):
 		return 'yahoo'
 
diff --git a/src/roster_window.py b/src/roster_window.py
index 19b8f3b05..79ff63988 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2056,7 +2056,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
 		self.tree.set_model(model)
 		self.make_jabber_state_images()
 		self.transports_state_images = { 'aim': {}, 'gadugadu': {}, 'irc': {},
-			'icq': {}, 'msn': {}, 'sms': {}, 'yahoo': {} }
+			'icq': {}, 'msn': {}, 'sms': {}, 'weather': {}, 'yahoo': {} }
 		
 		path = os.path.join(gajim.DATA_DIR, 'iconsets/transports')
 		folders = os.listdir(path)
@@ -2065,7 +2065,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
 				continue
 			folder = os.path.join(path, transport)
 			self.transports_state_images[transport] = self.load_iconset(
-				folder +	'/16x16/')
+				folder + '/16x16/')
 
 		liststore = gtk.ListStore(str, gtk.Image, str)
 		self.status_combobox = self.xml.get_widget('status_combobox')