diff -u -r src/common/connection.py src-sobis/common/connection.py
--- src/common/connection.py	2005-09-30 16:14:54.000000000 +0200
+++ src-sobis/common/connection.py	2005-11-05 00:35:27.000000000 +0100
@@ -1398,11 +1398,13 @@
 		sshow = show # show to be send
 		if show == 'online':
 			sshow = None
-		if not msg:
-			lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-			if lowered_uf_status_msg == _('invisible'): # do not show I'm invisible!
-				lowered_uf_status_msg = _('offline')
-			msg = _("I'm %s") % lowered_uf_status_msg
+		# sobis
+		#if not msg:
+			#lowered_uf_status_msg = helpers.get_uf_show(show).lower()
+			#if lowered_uf_status_msg == _('invisible'): # do not show I'm invisible!
+			#	lowered_uf_status_msg = _('offline')
+			#msg = _("I'm %s") % lowered_uf_status_msg
+		# /sobis
 
 		signed = ''
 		keyID = gajim.config.get_per('accounts', self.name, 'keyid')
diff -u -r src/roster_window.py src-sobis/roster_window.py
--- src/roster_window.py	2005-09-30 16:14:54.000000000 +0200
+++ src-sobis/roster_window.py	2005-11-05 01:27:34.000000000 +0100
@@ -213,9 +213,18 @@
 		contact_instances = gajim.get_contact_instances_from_jid(account, jid)
 		contact = gajim.get_highest_prio_contact_from_contacts(contact_instances)
 		name = contact.name
+		
 		if len(contact_instances) > 1:
 			name += ' (' + unicode(len(contact_instances)) + ')'
 
+		# sobis
+		if contact.status:
+			status = contact.status.strip()
+			if status != '':
+		        	# escape markup entities
+		        	name += '\n' + '<span size="small">' + gtkgui_helpers.escape_for_pango_markup(status) + '</span>'
+		# /sobis
+
 		state_images = self.get_appropriate_state_images(jid)
 		if gajim.awaiting_messages[account].has_key(jid):
 			img = state_images['message']
@@ -1262,8 +1271,11 @@
 	def get_status_message(self, show):
 		if (show == 'online' and not gajim.config.get('ask_online_status')) or \
 			(show == 'offline' and not gajim.config.get('ask_offline_status')):
-			lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-			return _("I'm %s") % lowered_uf_status_msg
+			# sobis
+			#lowered_uf_status_msg = helpers.get_uf_show(show).lower()
+			#return _("I'm %s") % lowered_uf_status_msg
+			return ""
+			# /sobis
 		dlg = dialogs.ChangeStatusMessageDialog(self.plugin, show)
 		message = dlg.run()
 		return message
@@ -1690,7 +1702,9 @@
 		jid = model[iter][3].decode('utf-8')
 		type = model[iter][2]
 		# restore the number of resources string at the end of contact name
-		if type == 'contact' and len(gajim.contacts[account][jid]) > 1:
+		# sobis
+		if type == 'contact': # and len(gajim.contacts[account][jid]) > 1:
+		# /sobis
 			self.draw_contact(jid, account)
 		# reset editing to False
 		model[iter][5] = False
@@ -2078,8 +2092,10 @@
 		self.popups_notification_height = 0
 		self.popup_notification_windows = []
 		self.gpg_passphrase = {}
+
 		#(icon, name, type, jid, account, editable, secondary_pixbuf)
 		model = gtk.TreeStore(gtk.Image, str, str, str, str, bool, gtk.gdk.Pixbuf)
+
 		model.set_sort_func(1, self.compareIters)
 		model.set_sort_column_id(1, gtk.SORT_ASCENDING)
 		self.tree.set_model(model)
@@ -2135,11 +2151,12 @@
 		render_text.connect('editing-canceled', self.on_editing_canceled)
 		render_text.connect('editing-started', self.on_editing_started)
 		col.pack_start(render_text, expand = True)
-		col.add_attribute(render_text, 'text', 1) # where we hold the name
+		# sobis
+		col.add_attribute(render_text, 'markup', 1) # where we hold the name
+		# /sobis
 		col.add_attribute(render_text, 'editable', 5)
 		col.set_cell_data_func(render_text, self.nameCellDataFunc, None)
 
-		
 		render_pixbuf = gtk.CellRendererPixbuf() # tls or avatar img
 		col.pack_start(render_pixbuf, expand = False)
 		col.add_attribute(render_pixbuf, 'pixbuf', 6)
diff -u -r src/tooltips.py src-sobis/tooltips.py
--- src/tooltips.py	2005-09-30 16:14:54.000000000 +0200
+++ src-sobis/tooltips.py	2005-11-04 18:31:15.000000000 +0100
@@ -371,7 +371,7 @@
 						# reduce long status (no more than 130 chars on line and no more than 5 lines)
 						status = gtkgui_helpers.reduce_chars_newlines(status, 130, 5)
 						# escape markup entities. 
-						info += ' - ' + gtkgui_helpers.escape_for_pango_markup(status)
+						info += '\n' + gtkgui_helpers.escape_for_pango_markup(status)
 		
 		self.text_lable.set_markup(info)
 		self.hbox.pack_start(self.image, False, False)