diff -Nuar psi-0.10-test3-orig/iconsets/system/default/icondef.xml psi-0.10-test3/iconsets/system/default/icondef.xml
--- psi-0.10-test3-orig/iconsets/system/default/icondef.xml	2005-12-05 00:55:40.000000000 +0000
+++ psi-0.10-test3/iconsets/system/default/icondef.xml	2005-12-05 00:56:27.000000000 +0000
@@ -399,6 +399,11 @@
 		<x xmlns='name'>psi/self</x>
 		<object mime='image/png'>account.png</object>
 	</icon>
+	
+	<icon>
+		<x xmlns='name'>psi/statusmsg</x>
+		<object mime='image/png'>info.png</object>
+	</icon>
 
 	<!-- Avatars -->
 	<!--<icon>
diff -Nuar psi-0.10-test3-orig/src/common.cpp psi-0.10-test3/src/common.cpp
--- psi-0.10-test3-orig/src/common.cpp	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/common.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -537,7 +537,7 @@
 	return TRUE;
 }
 
-QString linkify(const QString &in)
+QString linkify(const QString &in, QStringList * linkslist)
 {
 	QString out = in;
 	int x1, x2;
@@ -618,6 +618,8 @@
 			href = linkify_htmlsafe(href);
 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
 			linked = QString("<a href=\"%1\">").arg(href) + expandEntities(link) + "</a>" + expandEntities(pre.mid(cutoff));
+			if (linkslist != NULL)
+				linkslist->append (href);
 			out.replace(x1, len, linked);
 			n = x1 + linked.length() - 1;
 		}
@@ -651,6 +653,8 @@
 			href += link;
 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
 			linked = QString("<a href=\"%1\">").arg(href) + link + "</a>";
+			if (linkslist != NULL)
+				linkslist->append (href);
 			out.replace(x1, len, linked);
 			n = x1 + linked.length() - 1;
 		}
diff -Nuar psi-0.10-test3-orig/src/common.h psi-0.10-test3/src/common.h
--- psi-0.10-test3-orig/src/common.h	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/common.h	2005-12-05 01:07:48.000000000 +0000
@@ -29,6 +29,7 @@
 #include<qmessagebox.h>
 #include<qprocess.h>
 #include<qkeysequence.h>
+#include<qstringlist.h>
 #include"im.h"
 //#include"xmpp_message.h"
 //#include"xmpp_client.h"
@@ -71,14 +72,14 @@
 
 // options stuff
 enum { cOnline, cOffline, cAway, cDND, cProfileFore, cProfileBack, cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack };
-enum { fRoster, fMessage, fChat, fPopup };
+enum { fRoster, fMessage, fChat, fPopup, fStatusMes };
 enum { eMessage, eChat1, eChat2, eHeadline, eSystem, eOnline, eOffline, eSend, eIncomingFT, eFTComplete };
 enum { dcClose, dcHour, dcDay, dcNever };
 
 struct Options
 {
 	QColor color[11];
-	QString font[4];
+	QString font[5];
 	int smallFontSize; // do not modify or save/load this value! it is calculated at run time!
 	int alertStyle;
 
@@ -114,6 +115,10 @@
 	QString asMessage;
 	QString onevent[10];
 
+	int smChars;
+	bool smSingleLine, smShowResource;
+	// int smChars, smLines;
+
 	// Added by Kiko 020621: points to the directory where the trusted
 	// certificates used in validating the server's certificate are kept
 	QString trustCertStoreDir;
@@ -121,7 +126,7 @@
 	QString player;
 	QString customBrowser, customMailer;
 
-	bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats;
+	bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats, useStatusLinebreak;
 	bool raiseChatWindow, showSubjects, showCounter, chatSays, chatSoftReturn, showGroupCounts;
 
 	QSize sizeEventDlg, sizeChatDlg, sizeTabDlg;
@@ -164,6 +169,8 @@
 
 	bool clNewHeadings;
 	bool outlineHeadings;
+	bool clIconsAtTop;
+	bool clTransportStatus;
 
 	// passive popups
 	bool ppIsOn;
@@ -256,7 +263,7 @@
 QString clipStatus(const QString &str, int width, int height);
 QString expandEntities(const QString &in);
 QString resolveEntities(const QString &);
-QString linkify(const QString &);
+QString linkify(const QString &, QStringList * linkslist = NULL);
 QString emoticonify(const QString &in);
 
 QString encodePassword(const QString &, const QString &);
diff -Nuar psi-0.10-test3-orig/src/contactview.cpp psi-0.10-test3/src/contactview.cpp
--- psi-0.10-test3-orig/src/contactview.cpp	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/contactview.cpp	2005-12-05 01:05:47.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include<algorithm>
 #include<qapplication.h>
+#include<qsimplerichtext.h>
 #include<qptrlist.h>
 #include<qheader.h>
 #include<qtimer.h>
@@ -387,6 +388,8 @@
 		d->self->setContact(&d->su);
 		if(!d->su.isAvailable())
 			d->self->stopAnimateNick();
+		d->self->resetName();
+		d->self->repaint();
 	}
 }
 
@@ -572,6 +575,19 @@
 		removeUnneededContactItems(e);
 }
 
+void ContactProfile::resetAllContactItemNames()
+{
+	QPtrListIterator<Entry> it(d->roster);
+	for(Entry *e; (e = it.current()); ++it) {
+		QPtrListIterator<ContactViewItem> cvi_it(e->cvi);
+		for(ContactViewItem *i; (i = cvi_it.current()); ++cvi_it) {
+			i->resetName ();
+			i->repaint ();
+		}
+	}
+	updateSelf ();
+}
+
 void ContactProfile::removeEntry(const Jid &j)
 {
 	Entry *e = findEntry(j);
@@ -1118,6 +1134,25 @@
 		if(!isPrivate)
 			pm.insertItem(tr("Send message to"), s2m, 17);
 
+		int base_openurl = base_sendto + at_sendto;
+		int at_openurl = 0;
+		// URL in status message?
+		QStringList * urllist = i->giveUrlList ();
+		if (urllist->count () > 0)
+		{
+			QPopupMenu *urlm = new QPopupMenu(&pm);
+			urlm->setCheckable(false);
+
+			for ( QStringList::Iterator it = urllist->begin(); it != urllist->end(); ++it )
+			{
+				urlm->insertItem(IconsetFactory::iconPixmap("psi/www"), *it, base_openurl+at_openurl);
+				urlm->setItemEnabled (base_openurl+at_openurl, true);
+				at_openurl++;
+			}
+
+			pm.insertItem(tr("Go to status &URL"), urlm, 12);
+		}
+
 		d->cv->qa_chat->setIconSet(IconsetFactory::iconPixmap("psi/start-chat"));
 		d->cv->qa_chat->addTo(&pm);
 
@@ -1131,7 +1166,7 @@
 			}
 		}
 
-		int base_hidden = base_sendto + at_sendto;
+		int base_hidden = base_openurl + at_openurl;
 		int at_hidden = 0;
 		QStringList hc;
 		if(!isPrivate) {
@@ -1423,7 +1458,7 @@
 			if(online)
 				actionSendFile(u->jid());
 		}
-		else if(x >= base_sendto && x < base_hidden) {
+		else if(x >= base_sendto && x < base_openurl) {
 			int n = x - base_sendto;
 			int res = n / 2;
 			int type = n % 2;
@@ -1444,6 +1479,21 @@
 			else if(type == 1)
 				actionOpenChatSpecific(j);
 		}
+		else if(x >= base_openurl && x < base_hidden) {
+			int n = 0;
+			int n2 = x - base_openurl;
+
+			QString myurl;
+			for(QStringList::ConstIterator it = urllist->begin(); it != urllist->end(); ++it) {
+				if(n == n2) {
+					myurl = *it;
+					break;
+				}
+				++n;
+			}
+			if (! myurl.isEmpty())
+				openURL (myurl);
+		}
 		else if(x >= base_hidden && x < base_gc) {
 			int n = 0;
 			int n2 = x - base_hidden;
@@ -1530,6 +1580,7 @@
 
 	if((i->type() == ContactViewItem::Contact && i->u()->inList()) ||
 		(i->type() == ContactViewItem::Group && i->groupType() == ContactViewItem::gUser && i->groupName() != ContactView::tr("Hidden"))) {
+		i->resetName(true);
 		i->setRenameEnabled(0, true);
 		i->startRename(0);
 		i->setRenameEnabled(0, false);
@@ -1625,6 +1676,8 @@
 		//e->u.setName(text);
 		//i->setContact(&e->u);
 		actionRename(e->u.jid(), text);
+		i->unSelect();
+		i->resetName(); // to put the status message in if needed
 	}
 	else {
 		// no change?
@@ -1916,6 +1969,7 @@
 	v_showHidden = true;
 	v_showAgents = true;
 	v_showSelf = true;
+	v_showStatusMsg = true;
 
 	d->lastSize = QSize( 0, 0 );
 
@@ -2114,6 +2168,19 @@
 	return QListView::eventFilter( obj, event );
 }
 
+void ContactView::setShowStatusMsg(bool x)
+{
+	if (v_showStatusMsg != x) {
+		v_showStatusMsg = x;
+		emit showStatusMsg(v_showStatusMsg);
+		
+		QPtrListIterator<ContactProfile> it(d->profiles);
+		for(ContactProfile *cp; (cp = it.current()); ++it) {
+			cp->resetAllContactItemNames();
+		}
+	}
+}
+
 
 void ContactView::setShowAgents(bool x)
 {
@@ -2192,8 +2259,10 @@
 			//if(button == QListView::RightButton) {
 			//	qlv_contextPopup(i, pos, c);
 			//}
-			/*else*/if(button == QListView::LeftButton && option.singleclick) {
-				if(item->type() == ContactViewItem::Contact)
+			/*else*/
+			if (button == QListView::LeftButton && item->type() == ContactViewItem::Contact)
+			{
+				if (option.singleclick)
 					item->contactProfile()->scActionDefault(item);
 			}
 		}
@@ -2469,11 +2538,22 @@
 		cvi = parent;
 		cp = _cp;
 		u = 0;
+		rtName = 0;
+		rtStatus = 0;
+		strName = "";
+		strStatus = "";
+		v_selected = false;
+		v_active = false;
+		urllist.clear ();
 
 		icon = lastIcon = 0;
 	}
 
 	~Private() {
+		if (rtName)
+			delete rtName;
+		if (rtStatus)
+			delete rtStatus;
 	}
 
 	void initGroupState() {
@@ -2523,7 +2603,14 @@
 	QString groupInfo;
 
 	// contact
+	QString strName;
+	QString strStatus;
 	UserListItem *u;
+	QSimpleRichText *rtName;
+	QSimpleRichText *rtStatus;
+	QStringList urllist;
+	bool v_selected;
+	bool v_active;
 	bool isAgent;
 	bool alerting;
 	bool animatingNick;
@@ -2707,6 +2794,8 @@
 void ContactViewItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int width, int alignment)
 {
 	if ( d->type == Contact ) {
+		p->save();
+
 		QColorGroup xcg = cg;
 
 		if(d->status == STATUS_AWAY || d->status == STATUS_XA)
@@ -2721,39 +2810,147 @@
 			xcg.setColor(QColorGroup::HighlightedText, d->animateNickColor ? option.color[cAnimFront] : option.color[cAnimBack]);
 		}
 
-		QListViewItem::paintCell(p, xcg, column, width, alignment);
+		QListView* lv = listView();
+		const QPixmap *pix = pixmap(0);
+		QRect pxrect;
+
+		int x = lv->itemMargin();
+		int h1, h2, h;
+
+		bool selct = isSelected ();
+		bool activ = lv->isActiveWindow ();
+		bool status = false;
+		bool forcechange = false;
+
+		// use status message?
+		if (((ContactView*)lv)->isShowStatusMsg() && (!(d->u->isTransport()) || option.clTransportStatus) && !(d->strStatus.isEmpty ()))
+			status = true;
+
+		// contact has been (un)selected or (de)activated?
+		if (d->v_selected != selct || d->v_active != activ)
+		{
+			if (d->rtName)
+				delete d->rtName;
+			if (d->rtStatus)
+				delete d->rtStatus;
+
+			d->v_selected = selct;
+			d->v_active = activ;
+
+			forcechange = true;
+		}
+
+		// update name
+		if (forcechange || !d->rtName)
+		{
+			if (selct)
+				d->rtName = new QSimpleRichText (QString("<font color=\"%1\">").arg(lv->colorGroup().color( QColorGroup::HighlightedText ).name()) + d->strName + "</font>", lv->font());
+			else
+				d->rtName = new QSimpleRichText (d->strName, lv->font());
+		}
+		d->rtName->setWidth (lv->columnWidth(0) - x - depth() * lv->treeStepSize() - 2);
+		h1 = d->rtName->height ();
 
-		QFontMetrics fm(p->font());
-		const QPixmap *pix = pixmap(column);
-		int x = fm.width(text(column)) + (pix ? pix->width() : 0) + 8;
+		// update status
+		if (status)
+		{
+			if (forcechange || !d->rtStatus)
+			{
+				QFont stsfont;
+				stsfont.fromString (option.font[fStatusMes]);
+
+				if (selct)
+					d->rtStatus = new QSimpleRichText (QString("<font color=\"%1\">").arg(lv->colorGroup().color( QColorGroup::HighlightedText ).name()) + d->strStatus + "</font>", stsfont);
+				else
+					d->rtStatus = new QSimpleRichText (d->strStatus, stsfont);
+			}
+
+			d->rtStatus->setWidth (lv->columnWidth(0) - x - depth() * lv->treeStepSize() - 2);
+			// -2 to better fit into roster
+			h2 = d->rtStatus->height () - 2;
+		}
+		else
+			h2 = 0;
+
+		// total height
+		h = h1 + h2;
+
+		int pxh = 0;
+		int pxw = 0;
+
+		if (pix)
+		{
+			pxh = pix->height();
+			pxw = pix->width();
+
+			d->rtName->setWidth (d->rtName->width() - x - pxw);
+			h1 = d->rtName->height ();
+			if (status)
+			{
+				d->rtStatus->setWidth (d->rtName->width() - x - pxw);
+				h2 = d->rtStatus->height () - 2;
+			}
+			else
+				h2 = 0;
+			if ((h = QMAX (pxh + 2, h1 + h2)) % 2)
+				h++;
+
+			pxrect = QRect (x, (option.clIconsAtTop ? 2 : (h - pxh)/2), pxw, pxh);
+
+			x += pxw + lv->itemMargin();
+		}
+		else if (h % 2)
+			h++;
+		setHeight (h);
+
+		const QBrush *paper;
+		if (selct)
+			paper = &cg.brush( QColorGroup::Highlight );
+		else
+			paper = &cg.brush( (QColorGroup::ColorRole)QPalette::backgroundRoleFromMode( lv->viewport()->backgroundMode()) );
+
+		// start drawing
+		QRect rtrect ((x+2), (h - h1 - h2)/2, (d->rtName->width() + x), h1);
+		d->rtName->draw (p, rtrect.left(), rtrect.top(), rtrect, xcg, paper);
+
+		QRegion clip (0, 0, width, h);
+		clip -= rtrect;
+
+		if (status)
+		{
+			QRect rtrect2 ((x+2), (h + h1 - h2 - 4)/2, (d->rtName->width() + x), h2 + 1);
+			d->rtStatus->draw (p, rtrect2.left(), rtrect2.top(), rtrect2, xcg, paper);
+			clip -= rtrect2;
+		}
+
+		p->setClipRegion (clip, QPainter::CoordPainter);
+		p->fillRect (0, 0, width, h, *paper);
+
+		if (pix)
+			p->drawPixmap (pxrect, *pix);
+
+		p->restore();
 
 		if ( d->u ) {
 			UserResourceList::ConstIterator it = d->u->priority();
 			if(it != d->u->userResourceList().end()) {
 				if(d->u->isSecure((*it).name())) {
 					const QPixmap &pix = IconsetFactory::iconPixmap("psi/cryptoYes");
-					int y = (height() - pix.height()) / 2;
-					p->drawPixmap(x, y, pix);
-					x += 24;
+					const int y = (option.clIconsAtTop) ? 2 : (h - pix.height()) / 2;
+					p->drawPixmap((x + d->rtName->width() - pix.width() - 2), y, pix);
 				}
 			}
 		}
 	}
-	else if ( d->type == Group || d->type == Profile ) {
+	else if ( d->type == Group ) {
 		QColorGroup xcg = cg;
 
-		if(d->type == Profile) {
-			xcg.setColor(QColorGroup::Text, option.color[cProfileFore]);
-			xcg.setColor(QColorGroup::Base, option.color[cProfileBack]);
-		}
-		else if(d->type == Group) {
-			QFont f = p->font();
-			f.setPointSize(option.smallFontSize);
-			p->setFont(f);
-			xcg.setColor(QColorGroup::Text, option.color[cGroupFore]);
-			if (!option.clNewHeadings) {
-				xcg.setColor(QColorGroup::Base, option.color[cGroupBack]);
-			}
+		QFont f = p->font();
+		f.setPointSize(option.smallFontSize);
+		p->setFont(f);
+		xcg.setColor(QColorGroup::Text, option.color[cGroupFore]);
+		if (!option.clNewHeadings) {
+			xcg.setColor(QColorGroup::Base, option.color[cGroupBack]);
 		} 
 
 		QListViewItem::paintCell(p, xcg, column, width, alignment);
@@ -2762,13 +2959,6 @@
 		const QPixmap *pix = pixmap(column);
 		int x = fm.width(text(column)) + (pix ? pix->width() : 0) + 8;
 
-		if(d->type == Profile) {
-			const QPixmap &pix = d->ssl ? IconsetFactory::iconPixmap("psi/cryptoYes") : IconsetFactory::iconPixmap("psi/cryptoNo");
-			int y = (height() - pix.height()) / 2;
-			p->drawPixmap(x, y, pix);
-			x += 24;
-		}
-
 		if(isSelected())
 			p->setPen(xcg.highlightedText());
 		else
@@ -2783,7 +2973,7 @@
 		int info_y = ((height() - fm_info.height()) / 2) + fm_info.ascent();
 		p->drawText((info_x > x ? info_x : x), info_y, d->groupInfo);
 
-		if(d->type == Group && option.clNewHeadings && !isSelected()) {
+		if(option.clNewHeadings && !isSelected()) {
 			x += fm.width(d->groupInfo) + 8;
 			if(x < width - 8) {
 				int h = (height() / 2) - 1;
@@ -2804,6 +2994,42 @@
 			}
 		}
 	}
+	else if ( d->type == Profile ) {
+		QColorGroup xcg = cg;
+
+		xcg.setColor(QColorGroup::Text, option.color[cProfileFore]);
+		xcg.setColor(QColorGroup::Base, option.color[cProfileBack]);
+
+		QListViewItem::paintCell(p, xcg, column, width, alignment);
+
+		QFontMetrics fm(p->font());
+		const QPixmap *pix = pixmap(column);
+		int x = fm.width(text(column)) + (pix ? pix->width() : 0) + 8;
+
+		const QPixmap &pix2 = d->ssl ? IconsetFactory::iconPixmap("psi/cryptoYes") : IconsetFactory::iconPixmap("psi/cryptoNo");
+		int y = (height() - pix2.height()) / 2;
+		p->drawPixmap(x, y, pix2);
+		x += 24;
+
+		if(isSelected())
+			p->setPen(xcg.highlightedText());
+		else
+			p->setPen(xcg.text());
+
+		QFont f_info = p->font();
+		f_info.setPointSize(option.smallFontSize);
+		p->setFont(f_info);
+		QFontMetrics fm_info(p->font());
+		//int info_x = width - fm_info.width(d->groupInfo) - 8;
+		int info_x = x;
+		int info_y = ((height() - fm_info.height()) / 2) + fm_info.ascent();
+		p->drawText((info_x > x ? info_x : x), info_y, d->groupInfo);
+
+		if (option.outlineHeadings) {
+			p->setPen(QPen(option.color[cGroupFore]));
+			p->drawRect(0, 0, width, height());
+		}
+	}
 }
 
 /*
@@ -2955,18 +3181,128 @@
 	if ( !d->alerting && d->u ) {
 		setIcon(is->statusPtr(d->u));
 	}
+
+	// If the status is shown, update the text of the item too
+	if (static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg()) {
+		resetName();
+	}
 }
 
-void ContactViewItem::resetName()
+void ContactViewItem::resetName(bool forceNoStatusMsg)
 {
-	resetStatus();
 	if ( d->u ) {
 		QString s = jidnick(d->u->jid().full(), d->u->name());
 		if ( s != text(0) )
 			setText(0, s);
+
+		QString resr = QString::null;
+		if (option.smShowResource)
+		{
+			UserResourceList srl = d->u->userResourceList();
+			if(!srl.isEmpty()){
+				srl.sort();
+				const UserResource &r = *(srl.begin());
+				// resource
+				resr = r.name();
+				if(! resr.isEmpty())
+				{
+					// priority
+					QString prio = QString("%1").arg(r.priority());
+					if(! prio.isEmpty())
+						resr += " (" + prio + ")";
+
+					resr.simplifyWhiteSpace ();
+				}
+			}
+		}
+
+		if (resr.isEmpty())
+			s = "<nobr>" + plain2rich (s) + "</nobr>";
+		else
+			s = "<nobr>" + plain2rich (s) + " <font size=\"-1\"><i>" + resr + "</i></font></nobr>";
+
+		QListView* lv = listView();
+
+		QString statusMsg (QString::null);
+		// Add the status message if wanted 
+		if (!forceNoStatusMsg && ((ContactView*)lv)->isShowStatusMsg() && (!(d->u->isTransport()) || option.clTransportStatus))
+		{
+			statusMsg = makeStatusMessage ();
+			if (option.smSingleLine && !statusMsg.isEmpty())
+				statusMsg = "<nobr>" + statusMsg + "</nobr>";
+		}
+
+		// new name or status?
+		if (forceNoStatusMsg)
+		{
+			d->strName = s;
+			d->strStatus = statusMsg;
+
+			if (d->rtName)
+				delete d->rtName;
+			if (d->rtStatus)
+				delete d->rtStatus;
+			d->rtName = 0;
+			d->rtStatus = 0;
+		}
+		else
+		{
+			if (d->strName != s)
+			{
+				d->strName = s;
+				if (d->rtName)
+					delete d->rtName;
+				d->rtName = 0;
+			}
+			if (d->strStatus != statusMsg)
+			{
+				d->strStatus = statusMsg;
+				if (d->rtStatus)
+					delete d->rtStatus;
+				d->rtStatus = 0;
+			}
+		}
 	}
 }
 
+QString ContactViewItem::makeStatusMessage()
+{
+	QString statusMsg;
+
+	if (d->u->priority() != d->u->userResourceList().end()) 
+		statusMsg = (*d->u->priority()).status().status();
+	else 
+		statusMsg = d->u->lastUnavailableStatus().status();
+
+	if (statusMsg.simplifyWhiteSpace ().isEmpty ())
+		return QString::null;
+
+	statusMsg = plain2rich (statusMsg);
+
+	if (!option.useStatusLinebreak)
+		statusMsg = statusMsg.replace (QString ("<br>"), QString (" "));
+
+	d->urllist.clear ();
+	statusMsg = linkify (statusMsg, &(d->urllist));
+
+	if (option.useEmoticons)
+		statusMsg = emoticonify(statusMsg);
+
+	if (option.smChars != 0)
+		statusMsg = truncateRichText (statusMsg, option.smChars);
+
+	statusMsg = statusMsg.simplifyWhiteSpace();
+	if (statusMsg.isEmpty ())
+		return QString::null;
+
+	return statusMsg;
+}
+
+void ContactViewItem::unSelect()
+{
+	d->v_selected = false;
+}
+
 void ContactViewItem::resetGroupName()
 {
 	if ( d->groupName != text(0) )
@@ -3177,6 +3513,11 @@
 	return true;
 }
 
+QStringList * ContactViewItem::giveUrlList () const
+{
+	return &(d->urllist);
+}
+
 void ContactViewItem::dragEntered()
 {
 	//printf("entered\n");
@@ -3226,6 +3567,12 @@
 	}
 }
 
+void ContactViewItem::cancelRename (int i)
+{
+	QListViewItem::cancelRename(i);
+	resetName();
+}
+
 int ContactViewItem::rtti() const
 {
 	return 5103;
diff -Nuar psi-0.10-test3-orig/src/contactview.h psi-0.10-test3/src/contactview.h
--- psi-0.10-test3-orig/src/contactview.h	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/contactview.h	2005-12-05 00:56:27.000000000 +0000
@@ -23,6 +23,8 @@
 
 #include<qobject.h>
 #include<qlistview.h>
+#include<qsimplerichtext.h>
+#include<qstringlist.h>
 #include<qtooltip.h>
 #include<qvaluelist.h>
 #include"xmpp.h"
@@ -72,6 +74,7 @@
 
 	void addAllNeededContactItems();
 	void removeAllUnneededContactItems();
+	void resetAllContactItemNames();
 
 	void ensureVisible(const Jid &);
 	void clear();
@@ -185,6 +188,7 @@
 	bool isShowAway() const { return v_showAway; }
 	bool isShowHidden() const { return v_showHidden; }
 	bool isShowSelf() const { return v_showSelf; }
+	bool isShowStatusMsg() const { return v_showStatusMsg; }
 
 	void clear();
 	void resetAnim();
@@ -209,6 +214,7 @@
 	void showHidden(bool);
 	void showAgents(bool);
 	void showSelf(bool);
+	void showStatusMsg(bool);
 
 public slots:
 	void setShowOffline(bool);
@@ -216,6 +222,7 @@
 	void setShowAway(bool);
 	void setShowHidden(bool);
 	void setShowSelf(bool);
+	void setShowStatusMsg(bool);
 	void optionsUpdate();
 	void recalculateSize();
 
@@ -248,7 +255,7 @@
 	Private *d;
 
 	QPoint mousePressPos; // store pressed position, idea taken from Licq
-	bool v_showOffline, v_showAgents, v_showAway, v_showHidden, v_showSelf;
+	bool v_showOffline, v_showAgents, v_showAway, v_showHidden, v_showSelf, v_showStatusMsg;
 	bool lcto_active; // double click active?
 	QPoint lcto_pos;
 	QListViewItem *lcto_item;
@@ -298,8 +305,10 @@
 	void setIcon(const Icon *, bool alert = false);
 
 	void resetStatus();
-	void resetName(); // use this to cancel a rename
+	void resetName(bool forceNoStatusMsg = false); // use this to cancel a rename
+	QString makeStatusMessage();
 	void resetGroupName();
+	void unSelect ();
 
 	void updatePosition();
 	void optionsUpdate();
@@ -315,6 +324,8 @@
 	int compare(QListViewItem *, int, bool) const;
 	bool acceptDrop(const QMimeSource *) const;
 
+	QStringList * giveUrlList () const;
+
 public slots:
 	void resetAnim();
 	void iconUpdated(const QPixmap &);
@@ -325,6 +336,7 @@
 	void dragEntered();
 	void dragLeft();
 	void dropped(QDropEvent *);
+	void cancelRename (int);
 
 private:
 	class Private;
diff -Nuar psi-0.10-test3-orig/src/mainwin.cpp psi-0.10-test3/src/mainwin.cpp
--- psi-0.10-test3-orig/src/mainwin.cpp	2005-08-24 13:59:36.000000000 +0000
+++ psi-0.10-test3/src/mainwin.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -278,6 +278,8 @@
 	d->getAction("show_hidden")->addTo(viewMenu);
 	d->getAction("show_agents")->addTo(viewMenu);
 	d->getAction("show_self")->addTo(viewMenu);
+	viewMenu->insertSeparator();
+	d->getAction("show_statusmsg")->addTo(viewMenu);
 
 	// Mac-only menus
 #ifdef Q_WS_MAC
@@ -350,6 +352,7 @@
 		{ "show_hidden",  toggled, cvlist, SLOT( setShowHidden(bool) ) },
 		{ "show_agents",  toggled, cvlist, SLOT( setShowAgents(bool) ) },
 		{ "show_self",    toggled, cvlist, SLOT( setShowSelf(bool) ) },
+		{ "show_statusmsg", toggled, cvlist, SLOT( setShowStatusMsg(bool) ) },
 
 		{ "button_options", activated, this, SIGNAL( doOptions() ) },
 
@@ -408,6 +411,7 @@
 		{ "show_offline", cvlist, SIGNAL( showOffline(bool) ), setOn },
 		{ "show_self",    cvlist, SIGNAL( showSelf(bool) ), setOn },
 		{ "show_agents",  cvlist, SIGNAL( showAgents(bool) ), setOn },
+		{ "show_statusmsg", cvlist, SIGNAL( showStatusMsg(bool) ), setOn },
 		{ "", 0, 0, 0 }
 	};
 
diff -Nuar psi-0.10-test3-orig/src/options/opt_advanced.cpp psi-0.10-test3/src/options/opt_advanced.cpp
--- psi-0.10-test3-orig/src/options/opt_advanced.cpp	2005-08-21 17:44:28.000000000 +0000
+++ psi-0.10-test3/src/options/opt_advanced.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -41,9 +41,6 @@
 		"'Contact is Typing', ..."));
 	QWhatsThis::add(d->ck_autocopy,
 		tr("Check this option if you want the selected text in incoming messages and chat log to be automatically copied to clipboard"));
-	QWhatsThis::add(d->ck_singleclick,
-		tr("Normally, a double-click on a contact will invoke the default action."
-		"  Check this option if you'd rather invoke with a single-click."));
 	QWhatsThis::add(d->ck_jidComplete,
 		tr("Enables as-you-type JID autocompletion in message dialog."));
 	QWhatsThis::add(d->ck_grabUrls,
@@ -61,10 +58,6 @@
 		tr("Automatically sends iq:version query to contact when he becomes online. This allows you to determine what client he is using to get online. Note: results in increased traffic."));
 	QWhatsThis::add(d->ck_autoVCardOnLogin,
 		tr("By default, Psi always checks your vCard on login. If you want to save some traffic, you can uncheck this option."));
-	QWhatsThis::add(d->ck_rosterAnim,
-		tr("Makes Psi animate contact names in the main window when they come online."));
-	QWhatsThis::add(d->ck_scrollTo,
-		tr("Makes Psi scroll the main window automatically so you can see new incoming events."));
 	QWhatsThis::add(d->ck_ignoreHeadline,
 		tr("Makes Psi ignore all incoming \"headline\" events,"
 		" like system-wide news on MSN, announcements, etc."));
@@ -81,7 +74,6 @@
 
 	opt->messageEvents = d->ck_messageevents->isChecked();
 	opt->autoCopy = d->ck_autocopy->isChecked();
-	opt->singleclick = d->ck_singleclick->isChecked();
 	opt->jidComplete = d->ck_jidComplete->isChecked();
 	opt->grabUrls    = d->ck_grabUrls->isChecked();
 	opt->incomingAs = d->cb_incomingAs->currentItem();
@@ -89,8 +81,6 @@
 	opt->showCounter = d->ck_showCounter->isChecked();
 	opt->autoVersion = d->ck_autoVersion->isChecked();
 	opt->autoVCardOnLogin = d->ck_autoVCardOnLogin->isChecked();
-	opt->rosterAnim = d->ck_rosterAnim->isChecked();
-	opt->scrollTo = d->ck_scrollTo->isChecked();
 	opt->ignoreHeadline = d->ck_ignoreHeadline->isChecked();
 }
 
@@ -103,7 +93,6 @@
 
 	d->ck_messageevents->setChecked( opt->messageEvents );
 	d->ck_autocopy->setChecked( opt->autoCopy );
-	d->ck_singleclick->setChecked( opt->singleclick );
 	d->ck_jidComplete->setChecked( opt->jidComplete );
 	d->ck_grabUrls->setChecked( opt->grabUrls );
 	d->cb_incomingAs->setCurrentItem( opt->incomingAs );
@@ -111,7 +100,5 @@
 	d->ck_showCounter->setChecked( opt->showCounter );
 	d->ck_autoVersion->setChecked( opt->autoVersion );
 	d->ck_autoVCardOnLogin->setChecked( opt->autoVCardOnLogin );
-	d->ck_rosterAnim->setChecked( opt->rosterAnim );
-	d->ck_scrollTo->setChecked( opt->scrollTo );
 	d->ck_ignoreHeadline->setChecked( opt->ignoreHeadline );
 }
diff -Nuar psi-0.10-test3-orig/src/options/opt_advanced-ui.ui psi-0.10-test3/src/options/opt_advanced-ui.ui
--- psi-0.10-test3-orig/src/options/opt_advanced-ui.ui	2005-10-14 00:36:14.000000000 +0000
+++ psi-0.10-test3/src/options/opt_advanced-ui.ui	2005-12-05 00:56:27.000000000 +0000
@@ -32,14 +32,6 @@
         </widget>
         <widget class="QCheckBox">
             <property name="name">
-                <cstring>ck_singleclick</cstring>
-            </property>
-            <property name="text">
-                <string>Single-click triggers default action</string>
-            </property>
-        </widget>
-        <widget class="QCheckBox">
-            <property name="name">
                 <cstring>ck_autocopy</cstring>
             </property>
             <property name="text">
@@ -96,22 +88,6 @@
         </widget>
         <widget class="QCheckBox">
             <property name="name">
-                <cstring>ck_rosterAnim</cstring>
-            </property>
-            <property name="text">
-                <string>Animate the roster when a contact comes online</string>
-            </property>
-        </widget>
-        <widget class="QCheckBox">
-            <property name="name">
-                <cstring>ck_scrollTo</cstring>
-            </property>
-            <property name="text">
-                <string>Scroll roster to contact on event</string>
-            </property>
-        </widget>
-        <widget class="QCheckBox">
-            <property name="name">
                 <cstring>ck_ignoreHeadline</cstring>
             </property>
             <property name="text">
diff -Nuar psi-0.10-test3-orig/src/options/opt_appearance.cpp psi-0.10-test3/src/options/opt_appearance.cpp
--- psi-0.10-test3-orig/src/options/opt_appearance.cpp	2005-08-21 17:44:38.000000000 +0000
+++ psi-0.10-test3/src/options/opt_appearance.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -175,12 +175,14 @@
 	le_font[1] = d->le_fMessage;
 	le_font[2] = d->le_fChat;
 	le_font[3] = d->le_fPopup;
+	le_font[4] = d->le_fStatusMes;
 
 	bg_font = new QButtonGroup;
 	bg_font->insert(d->pb_fRoster, 0);
 	bg_font->insert(d->pb_fMessage, 1);
 	bg_font->insert(d->pb_fChat, 2);
 	bg_font->insert(d->pb_fPopup, 3);
+	bg_font->insert(d->pb_fStatusMes, 4);
 	connect(bg_font, SIGNAL(clicked(int)), SLOT(chooseFont(int)));
 
 	QWhatsThis::add(le_font[0],
@@ -191,6 +193,8 @@
 		tr("Specifies the font style for chat windows."));
 	QWhatsThis::add(le_font[3],
 		tr("Specifies the font style for popup windows."));
+	QWhatsThis::add(le_font[4],
+		tr("Specifies the font style for status messages in roster."));
 	QWhatsThis::add(d->pb_fRoster,
 		tr("Selects a font for the a roster window using the font selection dialog."));
 	QWhatsThis::add(d->pb_fMessage,
@@ -248,7 +252,7 @@
 	//opt->avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
 
 	int n;
-	for (n = 0; n < 4; ++n)
+	for (n = 0; n < 5; ++n)
 		opt->font[n] = le_font[n]->fontName();
 
 	for (n = 0; n < 11; ++n)
@@ -264,7 +268,7 @@
 	//d->ck_avatarsChatdlg->setChecked( opt->avatarsChatdlgEnabled ); // Avatars
 
 	int n;
-	for (n = 0; n < 4; ++n)
+	for (n = 0; n < 5; ++n)
 		le_font[n]->setFont(opt->font[n]);
 
 	for (n = 0; n < 11; ++n) {
diff -Nuar psi-0.10-test3-orig/src/options/opt_appearance.h psi-0.10-test3/src/options/opt_appearance.h
--- psi-0.10-test3-orig/src/options/opt_appearance.h	2005-08-21 17:44:38.000000000 +0000
+++ psi-0.10-test3/src/options/opt_appearance.h	2005-12-05 00:56:27.000000000 +0000
@@ -71,7 +71,7 @@
 private:
 	QWidget *w, *parentWidget;
 	QButtonGroup *bg_color;
-	FontLabel *le_font[4];
+	FontLabel *le_font[5];
 	QButtonGroup *bg_font;
 	Options *o;
 };
diff -Nuar psi-0.10-test3-orig/src/options/opt_appearance-ui.ui psi-0.10-test3/src/options/opt_appearance-ui.ui
--- psi-0.10-test3-orig/src/options/opt_appearance-ui.ui	2005-10-14 00:36:14.000000000 +0000
+++ psi-0.10-test3/src/options/opt_appearance-ui.ui	2005-12-05 00:56:27.000000000 +0000
@@ -398,6 +398,14 @@
                         <string>Choose</string>
                     </property>
                 </widget>
+                <widget class="QPushButton" row="4" column="2">
+                    <property name="name">
+                        <cstring>pb_fStatusMes</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Choose</string>
+                    </property>
+                </widget>
                 <widget class="QPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>pb_fChat</cstring>
@@ -436,6 +444,14 @@
                         <string>Roster</string>
                     </property>
                 </widget>
+                <widget class="QLabel" row="4" column="0">
+                    <property name="name">
+                        <cstring>TextLabel1</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Status Message</string>
+                    </property>
+                </widget>
                 <widget class="QLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1_4</cstring>
@@ -475,6 +491,11 @@
                         <cstring>le_fRoster</cstring>
                     </property>
                 </widget>
+                <widget class="FontLabel" row="4" column="1">
+                    <property name="name">
+                        <cstring>le_fStatusMes</cstring>
+                    </property>
+                </widget>
             </grid>
         </widget>
     </vbox>
diff -Nuar psi-0.10-test3-orig/src/options/optionsdlg.cpp psi-0.10-test3/src/options/optionsdlg.cpp
--- psi-0.10-test3-orig/src/options/optionsdlg.cpp	2005-11-01 16:17:36.000000000 +0000
+++ psi-0.10-test3/src/options/optionsdlg.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -23,6 +23,7 @@
 #include "opt_iconset.h"
 #include "opt_groupchat.h"
 #include "opt_sound.h"
+#include "opt_roster.h"
 #include "opt_advanced.h"
 
 #include "opt_lookfeel.h"
@@ -308,6 +309,7 @@
 	tabs.append( new OptionsTabChat(this) );
 	tabs.append( new OptionsTabEvents(this) );
 	tabs.append( new OptionsTabStatus(this) );
+	tabs.append( new OptionsTabRoster(this) );
 	tabs.append( new OptionsTabAppearance(this) );
 	//tabs.append( new OptionsTabIconsetSystem(this) );
 	//tabs.append( new OptionsTabIconsetRoster(this) );
diff -Nuar psi-0.10-test3-orig/src/options/options.pri psi-0.10-test3/src/options/options.pri
--- psi-0.10-test3-orig/src/options/options.pri	2005-08-21 17:44:38.000000000 +0000
+++ psi-0.10-test3/src/options/options.pri	2005-12-05 00:56:27.000000000 +0000
@@ -17,6 +17,7 @@
 	$$PSI_CPP/options/opt_chat.h \
 	$$PSI_CPP/options/opt_events.h \
 	$$PSI_CPP/options/opt_status.h \
+	$$PSI_CPP/options/opt_roster.h \
 	$$PSI_CPP/options/opt_appearance.h \
 	$$PSI_CPP/options/opt_lookfeel.h \
 	$$PSI_CPP/options/opt_iconset.h \
@@ -29,6 +30,7 @@
 	$$PSI_CPP/options/opt_chat.cpp \
 	$$PSI_CPP/options/opt_events.cpp \
 	$$PSI_CPP/options/opt_status.cpp \
+	$$PSI_CPP/options/opt_roster.cpp \
 	$$PSI_CPP/options/opt_appearance.cpp \
 	$$PSI_CPP/options/opt_lookfeel.cpp \
 	$$PSI_CPP/options/opt_iconset.cpp \
@@ -41,6 +43,7 @@
 	$$PSI_CPP/options/opt_chat-ui.ui \
 	$$PSI_CPP/options/opt_events-ui.ui \
 	$$PSI_CPP/options/opt_status-ui.ui \
+	$$PSI_CPP/options/opt_roster-ui.ui \
 	$$PSI_CPP/options/opt_appearance-ui.ui \
 	$$PSI_CPP/options/opt_appearance_misc-ui.ui \
 	$$PSI_CPP/options/opt_sound-ui.ui \
diff -Nuar psi-0.10-test3-orig/src/options/opt_roster.cpp psi-0.10-test3/src/options/opt_roster.cpp
--- psi-0.10-test3-orig/src/options/opt_roster.cpp	1970-01-01 00:00:00.000000000 +0000
+++ psi-0.10-test3/src/options/opt_roster.cpp	2005-12-05 01:07:32.000000000 +0000
@@ -0,0 +1,101 @@
+#include "opt_roster.h"
+#include "common.h"
+#include "iconwidget.h"
+
+#include <qwhatsthis.h>
+#include <qcheckbox.h>
+#include <qspinbox.h>
+#include <qbuttongroup.h>
+
+#include "opt_roster-ui.h"
+
+//----------------------------------------------------------------------------
+// OptionsTabRoster
+//----------------------------------------------------------------------------
+
+OptionsTabRoster::OptionsTabRoster(QObject *parent)
+: OptionsTab(parent, "roster", "", tr("Roster"), tr("Options for profiling roster window"), "psi/statusmsg")
+{
+	w = 0;
+}
+
+OptionsTabRoster::~OptionsTabRoster()
+{
+}
+
+QWidget *OptionsTabRoster::widget()
+{
+	if ( w )
+		return 0;
+
+	w = new OptRosterUI();
+	OptRosterUI *d = (OptRosterUI *)w;
+
+	QWhatsThis::add(d->ck_rosterAnim,
+		tr("Makes Psi animate contact names in the main window when they come online."));
+	QWhatsThis::add(d->ck_singleclick,
+		tr("Normally, a double-click on a contact will invoke the default action."
+		"  Check this option if you'd rather invoke with a single-click."));
+	QWhatsThis::add(d->ck_scrollTo,
+		tr("Makes Psi scroll the main window automatically so you can see new incoming events."));
+	QWhatsThis::add(d->ck_useStatusLinebreak,
+		tr("Use new lines characters in shown statuses (shown statuses will be a bit bigger with this)."));
+
+	QWhatsThis::add(d->ck_showResource,
+		tr("Show contact's resource and priority in roster."));
+	QWhatsThis::add(d->ck_transportStatus,
+		tr("Show status messages also for transports."));
+	QWhatsThis::add(d->ck_useSingleLineStatus,
+		tr("Show only single line as contact's status message."));
+	QWhatsThis::add(d->sb_smChars,
+		tr("Defines maximum number of characters used for viewing status messages in roster"));
+//	QWhatsThis::add(d->sb_smLines,
+//		tr("Defines maximum number of lines used for viewing status messages in roster"));
+
+	return w;
+}
+
+void OptionsTabRoster::applyOptions(Options *opt)
+{
+	if ( !w )
+		return;
+
+	OptRosterUI *d = (OptRosterUI *)w;
+
+	opt->rosterAnim = d->ck_rosterAnim->isChecked();
+	opt->singleclick = d->ck_singleclick->isChecked();
+	opt->scrollTo = d->ck_scrollTo->isChecked();
+	opt->clIconsAtTop  = d->ck_iconsAtTop->isChecked();
+	opt->smSingleLine = d->ck_useSingleLineStatus->isChecked();
+	opt->useStatusLinebreak = d->ck_useStatusLinebreak->isChecked();
+	opt->clTransportStatus = d->ck_transportStatus->isChecked();
+	opt->smShowResource = d->ck_showResource->isChecked();
+
+	opt->smChars = d->sb_smChars->value();
+//	opt->smLines = d->sb_smLines->value();
+}
+
+void OptionsTabRoster::restoreOptions(const Options *opt)
+{
+	if ( !w )
+		return;
+
+	OptRosterUI *d = (OptRosterUI *)w;
+
+	d->ck_rosterAnim->setChecked( opt->rosterAnim );
+	d->ck_singleclick->setChecked( opt->singleclick );
+	d->ck_scrollTo->setChecked( opt->scrollTo );
+	d->ck_iconsAtTop->setChecked( opt->clIconsAtTop );
+	d->ck_useSingleLineStatus->setChecked( opt->smSingleLine );
+	d->ck_useStatusLinebreak->setChecked( opt->useStatusLinebreak );
+	d->ck_transportStatus->setChecked( opt->clTransportStatus );
+	d->ck_showResource->setChecked( opt->smShowResource );
+
+	d->sb_smChars->setMinValue(0);
+	d->sb_smChars->setMaxValue(1000);
+	d->sb_smChars->setValue( opt->smChars );
+//	d->sb_smLines->setMinValue(0);
+//	d->sb_smLines->setMaxValue(100);
+//	d->sb_smLines->setValue( opt->smLines );
+}
+
diff -Nuar psi-0.10-test3-orig/src/options/opt_roster.h psi-0.10-test3/src/options/opt_roster.h
--- psi-0.10-test3-orig/src/options/opt_roster.h	1970-01-01 00:00:00.000000000 +0000
+++ psi-0.10-test3/src/options/opt_roster.h	2005-12-05 00:56:27.000000000 +0000
@@ -0,0 +1,25 @@
+#ifndef OPT_ROSTER_H
+#define OPT_ROSTER_H
+
+#include "optionstab.h"
+
+class QWidget;
+struct Options;
+
+class OptionsTabRoster : public OptionsTab
+{
+	Q_OBJECT
+public:
+	OptionsTabRoster(QObject *parent);
+	~OptionsTabRoster();
+
+	QWidget *widget();
+	void applyOptions(Options *opt);
+	void restoreOptions(const Options *opt);
+
+private:
+	QWidget *w;
+};
+
+#endif
+
diff -Nuar psi-0.10-test3-orig/src/options/opt_roster-ui.ui psi-0.10-test3/src/options/opt_roster-ui.ui
--- psi-0.10-test3-orig/src/options/opt_roster-ui.ui	1970-01-01 00:00:00.000000000 +0000
+++ psi-0.10-test3/src/options/opt_roster-ui.ui	2005-12-05 01:06:36.000000000 +0000
@@ -0,0 +1,202 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>OptRosterUI</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>OptRosterUI</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>360</width>
+            <height>210</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string>OptRosterUI</string>
+    </property>
+    <vbox>
+        <property name="name">
+            <cstring>unnamed</cstring>
+        </property>
+        <property name="margin">
+            <number>0</number>
+        </property>
+        <property name="spacing">
+            <number>2</number>
+        </property>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>ck_rosterAnim</cstring>
+            </property>
+            <property name="text">
+                <string>Animate the roster when a contact comes online</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>ck_singleclick</cstring>
+            </property>
+            <property name="text">
+                <string>Single-click triggers default action</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>ck_scrollTo</cstring>
+            </property>
+            <property name="text">
+                <string>Scroll roster to contact on event</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>ck_iconsAtTop</cstring>
+            </property>
+            <property name="text">
+                <string>Align contact icons to top</string>
+            </property>
+        </widget>
+        <widget class="QGroupBox">
+            <property name="name">
+                <cstring>groupBox11</cstring>
+            </property>
+            <property name="title">
+                <string>Status messages</string>
+            </property>
+            <widget class="QLayoutWidget">
+                <property name="name">
+                    <cstring>Layout15</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>25</y>
+                        <width>354</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <grid>
+                    <property name="name">
+                        <cstring>unnamed</cstring>
+                    </property>
+                    <property name="spacing">
+                        <number>10</number>
+                    </property>
+                    <property name="margin">
+                        <number>0</number>
+                    </property>
+                    <property name="spacing">
+                        <number>1</number>
+                    </property>
+                    <widget class="QLabel" row="0" column="0">
+                        <property name="name">
+                            <cstring>lb_smChars</cstring>
+                        </property>
+                        <property name="enabled">
+                            <bool>true</bool>
+                        </property>
+                        <property name="text">
+                            <string>Maximum characters in status</string>
+                        </property>
+                    </widget>
+                    <widget class="QSpinBox" row="0" column="1">
+                        <property name="name">
+                            <cstring>sb_smChars</cstring>
+                        </property>
+                        <property name="enabled">
+                            <bool>true</bool>
+                        </property>
+                    </widget>
+                    <widget class="QLabel" row="0" column="2">
+                        <property name="name">
+                            <cstring>lb_smInfo1</cstring>
+                        </property>
+                        <property name="text">
+                            <string>(0 - no maximum)</string>
+                        </property>
+                    </widget>
+                </grid>
+            </widget>
+            <widget class="QLayoutWidget">
+                <property name="name">
+                    <cstring>Layout15</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>55</y>
+                        <width>354</width>
+                        <height>111</height>
+                    </rect>
+                </property>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>ck_showResource</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>0</x>
+                            <y>0</y>
+                            <width>354</width>
+                            <height>26</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>Show contact's resource and priority (if available)</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>ck_useSingleLineStatus</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>0</x>
+                            <y>28</y>
+                            <width>354</width>
+                            <height>26</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>Show single line status messages</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>ck_useStatusLinebreak</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>0</x>
+                            <y>56</y>
+                            <width>354</width>
+                            <height>26</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>Use linebreaks in status messages</string>
+                    </property>
+                </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>ck_transportStatus</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>0</x>
+                            <y>84</y>
+                            <width>354</width>
+                            <height>26</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>Use status showing for transports</string>
+                    </property>
+                </widget>
+            </widget>
+        </widget>
+    </vbox>
+</widget>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
diff -Nuar psi-0.10-test3-orig/src/profiles.h psi-0.10-test3/src/profiles.h
--- psi-0.10-test3-orig/src/profiles.h	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/profiles.h	2005-12-05 00:56:27.000000000 +0000
@@ -46,7 +46,7 @@
 	QString jid, pass, host, resource;
 	int port, priority;
  	bool opt_enabled, opt_ssl, opt_pass, opt_host, opt_auto, opt_keepAlive, opt_plain, opt_log, opt_reconn, opt_ignoreSSLWarnings;
-	bool tog_offline, tog_away, tog_agents, tog_hidden, tog_self;
+	bool tog_offline, tog_away, tog_agents, tog_hidden, tog_self, tog_statusmsg;
 
 	int proxy_index;
 	int proxy_type, proxy_port;
diff -Nuar psi-0.10-test3-orig/src/psiaccount.cpp psi-0.10-test3/src/psiaccount.cpp
--- psi-0.10-test3-orig/src/psiaccount.cpp	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/psiaccount.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -519,7 +519,7 @@
 	connect(d->psi, SIGNAL(pgpToggled(bool)), SLOT(pgpToggled(bool)));
 	connect(d->psi, SIGNAL(pgpKeysUpdated()), SLOT(pgpKeysUpdated()));
 
-	d->psi->setToggles(d->acc.tog_offline, d->acc.tog_away, d->acc.tog_agents, d->acc.tog_hidden,d->acc.tog_self);
+	d->psi->setToggles(d->acc.tog_offline, d->acc.tog_away, d->acc.tog_agents, d->acc.tog_hidden,d->acc.tog_self, d->acc.tog_statusmsg);
 
 	d->setEnabled(d->acc.opt_enabled);
 
@@ -626,7 +626,7 @@
 
 const UserAccount & PsiAccount::userAccount() const
 {
-	d->psi->getToggles(&d->acc.tog_offline, &d->acc.tog_away, &d->acc.tog_agents, &d->acc.tog_hidden,&d->acc.tog_self);
+	d->psi->getToggles(&d->acc.tog_offline, &d->acc.tog_away, &d->acc.tog_agents, &d->acc.tog_hidden,&d->acc.tog_self,&d->acc.tog_statusmsg);
 
 	// save the roster and pgp key bindings
 	d->acc.roster.clear();
@@ -1319,6 +1319,12 @@
 
 void PsiAccount::client_resourceAvailable(const Jid &j, const Resource &r)
 {
+	// we will clean the whitespace in the status
+	// use res instead of r
+	Resource res = r;
+	Status cleanStatus = r.status();
+	cleanStatus.setStatus(cleanStatus.status().stripWhiteSpace());
+
 	enum PopupType {
 		PopupOnline = 0,
 		PopupStatusChange = 1
@@ -1335,18 +1341,17 @@
 	for(UserListItem *u; (u = it.current()); ++it) {
 		bool doAnim = false;
 		bool local = false;
-		if(u->isSelf() && r.name() == d->client->resource())
+		if(u->isSelf() && res.name() == d->client->resource())
 			local = true;
 
 		// add/update the resource
-		QString oldStatus, oldKey;
 		UserResource *rp;
 		UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
 		bool found = (rit == u->userResourceList().end()) ? false: true;
 		if(!found) {
 			popupType = PopupOnline;
 
-			UserResource ur(r);
+			UserResource ur(res);
 			//ur.setSecurityEnabled(true);
 			if(local)
 				ur.setClient(PROG_NAME,PROG_VERSION,getOSName());
@@ -1372,11 +1377,9 @@
 			if ( !doPopup )
 				popupType = PopupStatusChange;
 
-			oldStatus = (*rit).status().status();
-			oldKey = (*rit).status().keyID();
 			rp = &(*rit);
 
-			(*rit).setResource(r);
+			(*rit).setResource(res);
 
 			if (!local && !u->isHidden())
 				doPopup = true;
@@ -1387,7 +1390,7 @@
 			tryVerify(u, rp);
 
 		u->setPresenceError("");
-		cpUpdate(*u, r.name(), true);
+		cpUpdate(*u, res.name(), true);
 
 		if(doAnim && option.rosterAnim)
 			d->cp->animateNick(u->jid());
@@ -1412,7 +1415,7 @@
 
 		if ((popupType == PopupOnline && option.ppOnline) || (popupType == PopupStatusChange && option.ppStatus)) {
 			PsiPopup *popup = new PsiPopup(pt, this);
-			popup->setData(j, r, u);
+			popup->setData(j, res, u);
 		}
 #if defined(Q_WS_MAC) && defined(HAVE_GROWL)
 		PsiGrowlNotifier::instance()->popup(this, pt, j, r, u);
@@ -1424,6 +1427,13 @@
 
 void PsiAccount::client_resourceUnavailable(const Jid &j, const Resource &r)
 {
+	// we will clean the whitespace in the status
+	// use res instead of r
+	Resource res = r;
+	Status cleanStatus = r.status();
+	cleanStatus.setStatus(cleanStatus.status().stripWhiteSpace());
+	res.setStatus(cleanStatus);
+
 	bool doSound = false;
 	bool doPopup = false;
 
@@ -1434,14 +1444,14 @@
 	QPtrListIterator<UserListItem> it(list);
 	for(UserListItem *u; (u = it.current()); ++it) {
 		bool local = false;
-		if(u->isSelf() && r.name() == d->client->resource())
+		if(u->isSelf() && res.name() == d->client->resource())
 			local = true;
 
 		// remove resource
 		UserResourceList::Iterator rit = u->userResourceList().find(j.resource());
 		bool found = (rit == u->userResourceList().end()) ? false: true;
 		if(found) {
-			u->setLastUnavailableStatus(r.status());
+			u->setLastUnavailableStatus(res.status());
 			u->userResourceList().remove(rit);
 
 			if(!u->isAvailable())
@@ -1457,7 +1467,7 @@
 		}
 
 		u->setPresenceError("");
-		cpUpdate(*u, r.name(), true);
+		cpUpdate(*u, res.name(), true);
 	}
 	if(doSound)
 		playSound(option.onevent[eOffline]);
@@ -1472,7 +1482,7 @@
 
 		if (option.ppOffline) {
 			PsiPopup *popup = new PsiPopup(PsiPopup::AlertOffline, this);
-			popup->setData(j, r, u);
+			popup->setData(j, res, u);
 		}
 #if defined(Q_WS_MAC) && defined(HAVE_GROWL)
 		PsiGrowlNotifier::instance()->popup(this, PsiPopup::AlertOffline, j, r, u);
@@ -1753,6 +1763,8 @@
 {
 	Status s = _s;
 	s.setPriority(d->acc.priority);
+	// remove all starting and ending whitespace in the status message
+	s.setStatus(s.status().stripWhiteSpace());
 
 	//printf("setting status to [%s]\n", s.status().latin1());
 
diff -Nuar psi-0.10-test3-orig/src/psiactionlist.cpp psi-0.10-test3/src/psiactionlist.cpp
--- psi-0.10-test3-orig/src/psiactionlist.cpp	2005-08-24 13:59:36.000000000 +0000
+++ psi-0.10-test3/src/psiactionlist.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -127,6 +127,9 @@
 		IconAction *showSelf = new IconAction (tr("Show Self Contact"), "psi/self", tr("Show Self Contact"), 0, viewGroups, 0, true);
 		showSelf->setWhatsThis (tr("Toggles visibility of self contact in roster"));
 
+		IconAction *showStatusMsg = new IconAction (tr("Show Status Messages"), "psi/statusmsg", tr("Show Status Messages"), 0, viewGroups, 0, true);
+		showSelf->setWhatsThis (tr("Toggles visibility of status messages of contacts"));
+
 		ActionNames actions[] = {
 			{ "view_groups",  viewGroups  },
 			{ "show_offline", showOffline },
@@ -134,6 +137,7 @@
 			{ "show_hidden",  showHidden  },
 			{ "show_agents",  showAgents  },
 			{ "show_self",    showSelf    },
+			{ "show_statusmsg", showStatusMsg },
 			{ "", 0 }
 		};
 
diff -Nuar psi-0.10-test3-orig/src/psicon.cpp psi-0.10-test3/src/psicon.cpp
--- psi-0.10-test3-orig/src/psicon.cpp	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/psicon.cpp	2005-12-05 00:56:27.000000000 +0000
@@ -1052,7 +1052,7 @@
 	}
 }
 
-void PsiCon::setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self)
+void PsiCon::setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self, bool tog_statusmsg)
 {
 	if(d->listEnabled.count() > 1)
 		return;
@@ -1062,15 +1062,17 @@
 	d->mainwin->cvlist->setShowAgents(tog_agents);
 	d->mainwin->cvlist->setShowHidden(tog_hidden);
 	d->mainwin->cvlist->setShowSelf(tog_self);
+	d->mainwin->cvlist->setShowStatusMsg(tog_statusmsg);
 }
 
-void PsiCon::getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self)
+void PsiCon::getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self, bool *tog_statusmsg)
 {
 	*tog_offline = d->mainwin->cvlist->isShowOffline();
 	*tog_away = d->mainwin->cvlist->isShowAway();
 	*tog_agents = d->mainwin->cvlist->isShowAgents();
 	*tog_hidden = d->mainwin->cvlist->isShowHidden();
 	*tog_self = d->mainwin->cvlist->isShowSelf();
+	*tog_statusmsg = d->mainwin->cvlist->isShowStatusMsg();
 }
 
 void PsiCon::doOptions()
diff -Nuar psi-0.10-test3-orig/src/psicon.h psi-0.10-test3/src/psicon.h
--- psi-0.10-test3-orig/src/psicon.h	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/psicon.h	2005-12-05 00:56:27.000000000 +0000
@@ -200,8 +200,8 @@
 	friend class PsiAccount;
 	void link(PsiAccount *);
 	void unlink(PsiAccount *);
-	void setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self);
-	void getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self);
+	void setToggles(bool tog_offline, bool tog_away, bool tog_agents, bool tog_hidden, bool tog_self, bool tog_statusmsg);
+	void getToggles(bool *tog_offline, bool *tog_away, bool *tog_agents, bool *tog_hidden, bool *tog_self, bool *tog_statusmsg);
 
 	friend class EventQueue;
 	int getId();
diff -Nuar psi-0.10-test3-orig/src/psi_profiles.cpp psi-0.10-test3/src/psi_profiles.cpp
--- psi-0.10-test3-orig/src/psi_profiles.cpp	2005-12-05 00:55:43.000000000 +0000
+++ psi-0.10-test3/src/psi_profiles.cpp	2005-12-05 01:08:21.000000000 +0000
@@ -53,7 +53,8 @@
 	tog_away = TRUE;
 	tog_hidden = TRUE;
 	tog_agents = TRUE;
-	tog_self = FALSE;
+	tog_self = TRUE;
+	tog_statusmsg = TRUE;
 	jid = "";
 	pass = "";
 	opt_pass = FALSE;
@@ -99,6 +100,7 @@
 	setBoolAttribute(a, "showHidden", tog_hidden);
 	setBoolAttribute(a, "showAgents", tog_agents);
 	setBoolAttribute(a, "showSelf", tog_self);
+	setBoolAttribute(a, "showStatusMsg", tog_statusmsg);
 	setBoolAttribute(a, "keepAlive", opt_keepAlive);
 	setBoolAttribute(a, "plain", opt_plain);
 	setBoolAttribute(a, "log", opt_log);
@@ -206,6 +208,7 @@
 	readBoolAttribute(a, "showHidden", &tog_hidden);
 	readBoolAttribute(a, "showAgents", &tog_agents);
 	readBoolAttribute(a, "showSelf", &tog_self);
+	readBoolAttribute(a, "showStatusMsg", &tog_statusmsg);
 	readBoolAttribute(a, "keepAlive", &opt_keepAlive);
 	readBoolAttribute(a, "plain", &opt_plain);
 	readBoolAttribute(a, "log", &opt_log);
@@ -376,6 +379,11 @@
 	prefs.use_asOffline = FALSE;
 	prefs.asMessage = QObject::tr("Auto Status (idle)");
 	prefs.scrollTo = TRUE;
+	prefs.useStatusLinebreak = true;
+	prefs.smShowResource = false;
+	prefs.smChars = 120;
+	prefs.smSingleLine = false;
+//	prefs.smLines = 5;
 	prefs.useEmoticons = false;
 	prefs.alertOpenChats = false;
 	prefs.raiseChatWindow = false;
@@ -428,8 +436,11 @@
 		QFont font = QApplication::font();
 		font.setPointSize( font.pointSize() - 2 );
 		prefs.font[fPopup] = font.toString();
+		prefs.font[fStatusMes] = font.toString();
 	}
 
+	prefs.clIconsAtTop = TRUE;
+
 	// calculate the small font size
 	const int minimumFontSize = 7;
 	prefs.smallFontSize = qApp->font().pointSize();
@@ -439,6 +450,7 @@
 	FancyLabel::setSmallFontSize( prefs.smallFontSize );
 
 	prefs.clNewHeadings = false;
+	prefs.clTransportStatus = true;
 	prefs.chatOpacity = 100;
 	prefs.rosterOpacity = 90;
 	prefs.outlineHeadings = false;
@@ -514,7 +526,7 @@
 		tb[1].name = QObject::tr("Show contacts");
 		tb[1].on = defaultEnableToolbars;
 		tb[1].locked = true;
-		tb[1].keys << "show_offline" << "show_away" << "show_agents" << "show_self";
+		tb[1].keys << "show_offline" << "show_away" << "show_agents" << "show_self" << "spacer" << "show_statusmsg";
 
 		tb[2].name = QObject::tr("Event notifier");
 		tb[2].on = false;
@@ -757,7 +769,6 @@
 
 			p_roster.appendChild(textTag(doc, "useleft", prefs.useleft));
 			p_roster.appendChild(textTag(doc, "rosterBgImage", prefs.rosterBgImage));
-			p_roster.appendChild(textTag(doc, "singleclick", prefs.singleclick));
 			p_roster.appendChild(textTag(doc, "hideMenubar", prefs.hideMenubar));
 			p_roster.appendChild(textTag(doc, "defaultAction", prefs.defaultAction));
 			p_roster.appendChild(textTag(doc, "useTransportIconsForContacts", prefs.useTransportIconsForContacts));
@@ -813,7 +824,6 @@
 			p_misc.appendChild(textTag(doc, "ignoreHeadline", prefs.ignoreHeadline));
 			p_misc.appendChild(textTag(doc, "ignoreNonRoster", prefs.ignoreNonRoster));
 			p_misc.appendChild(textTag(doc, "excludeGroupChatIgnore", prefs.excludeGroupChatsFromIgnore));
-			p_misc.appendChild(textTag(doc, "scrollTo", prefs.scrollTo));
 			p_misc.appendChild(textTag(doc, "useEmoticons", prefs.useEmoticons));
 			p_misc.appendChild(textTag(doc, "alertOpenChats", prefs.alertOpenChats));
 			p_misc.appendChild(textTag(doc, "raiseChatWindow", prefs.raiseChatWindow));
@@ -900,7 +910,6 @@
 
 			tag.appendChild(textTag(doc, "askOnline", prefs.askOnline));
 			tag.appendChild(textTag(doc, "askOffline", prefs.askOffline));
-			tag.appendChild(textTag(doc, "rosterAnim", prefs.rosterAnim));
 			tag.appendChild(textTag(doc, "autoVersion", prefs.autoVersion));
 			tag.appendChild(textTag(doc, "autoVCardOnLogin", prefs.autoVCardOnLogin));
 			tag.appendChild(textTag(doc, "xmlConsoleOnLogin", prefs.xmlConsoleOnLogin));
@@ -934,10 +943,37 @@
 	}
 
 	{
+		QDomElement p_roster = doc.createElement("rosterset");
+		p.appendChild(p_roster);
+
+		{
+			QDomElement tag = doc.createElement("misc");
+			p_roster.appendChild(tag);
+
+			tag.appendChild(textTag(doc, "rosterAnim", prefs.rosterAnim));
+			tag.appendChild(textTag(doc, "singleclick", prefs.singleclick));
+			tag.appendChild(textTag(doc, "scrollTo", prefs.scrollTo));
+			tag.appendChild(textTag(doc, "contactIconsAtTop", prefs.clIconsAtTop));
+			tag.appendChild(textTag(doc, "newHeadings", prefs.clNewHeadings));
+		}
+
+		{
+			QDomElement tag = doc.createElement("statusmsgs");
+			p_roster.appendChild(tag);
+
+			tag.appendChild(textTag(doc, "smChars", prefs.smChars));
+			tag.appendChild(textTag(doc, "smSingleLine", prefs.smSingleLine));
+			tag.appendChild(textTag(doc, "smShowResource", prefs.smShowResource));
+//			tag.appendChild(textTag(doc, "smLines", prefs.smLines));
+			tag.appendChild(textTag(doc, "statusLinebreak", prefs.useStatusLinebreak));
+			tag.appendChild(textTag(doc, "transportStatus", prefs.clTransportStatus));
+		}
+	}
+
+	{
 		QDomElement p_lnf = doc.createElement("lookandfeel");
 		p.appendChild(p_lnf);
 
-		p_lnf.appendChild(textTag(doc, "newHeadings", prefs.clNewHeadings));
 		p_lnf.appendChild(textTag(doc, "chat-opacity", prefs.chatOpacity));
 		p_lnf.appendChild(textTag(doc, "roster-opacity", prefs.rosterOpacity));
 		p_lnf.appendChild(textTag(doc, "outline-headings", prefs.outlineHeadings));
@@ -967,6 +1003,7 @@
 			tag.appendChild(textTag(doc, "message", prefs.font[fMessage] ));
 			tag.appendChild(textTag(doc, "chat", prefs.font[fChat] ));
 			tag.appendChild(textTag(doc, "popup", prefs.font[fPopup] ));
+			tag.appendChild(textTag(doc, "statusmsg", prefs.font[fStatusMes] ));
 		}
 	}
 
@@ -1406,7 +1443,6 @@
 			if(found) {
 				readEntry(p_roster, "rosterBgImage", &prefs.rosterBgImage);
 				readBoolEntry(p_roster, "useleft", &prefs.useleft);
-				readBoolEntry(p_roster, "singleclick", &prefs.singleclick);
 				readBoolEntry(p_roster, "hideMenubar", &prefs.hideMenubar);
 				readNumEntry(p_roster, "defaultAction", &prefs.defaultAction);
 				readBoolEntry(p_roster, "useTransportIconsForContacts", &prefs.useTransportIconsForContacts);
@@ -1456,7 +1492,6 @@
 				readBoolEntry(tag, "ignoreHeadline", &prefs.ignoreHeadline);
 				readBoolEntry(tag, "ignoreNonRoster", &prefs.ignoreNonRoster);
 				readBoolEntry(tag, "excludeGroupChatIgnore", &prefs.excludeGroupChatsFromIgnore);
-				readBoolEntry(tag, "scrollTo", &prefs.scrollTo);
 				readBoolEntry(tag, "useEmoticons", &prefs.useEmoticons);
 				readBoolEntry(tag, "alertOpenChats", &prefs.alertOpenChats);
 				readBoolEntry(tag, "raiseChatWindow", &prefs.raiseChatWindow);
@@ -1585,11 +1620,34 @@
 			xmlToStringList(p_pres, "recentstatus", &prefs.recentStatus);
 		}
 
+		QDomElement p_roster = findSubTag(p, "rosterset", &found);
+ 		if(found) {
+ 			bool found;
+ 
+			QDomElement tag = findSubTag(p_roster, "misc", &found);
+			if(found) {
+				readBoolEntry(tag, "rosterAnim", &prefs.rosterAnim);
+				readBoolEntry(tag, "singleclick", &prefs.singleclick);
+				readBoolEntry(tag, "scrollTo", &prefs.scrollTo);
+				readBoolEntry(tag, "contactIconsAtTop", &prefs.clIconsAtTop);
+				readBoolEntry(tag, "newHeadings", &prefs.clNewHeadings);
+			}
+
+			tag = findSubTag(p_roster, "statusmsgs", &found);
+			if(found) {
+				readNumEntry(tag, "smChars", &prefs.smChars);
+				readBoolEntry(tag, "smSingleLine", &prefs.smSingleLine);
+				readBoolEntry(tag, "smShowResource", &prefs.smShowResource);
+//				readNumEntry(tag, "smLines", &prefs.smLines);
+				readBoolEntry(tag, "statusLinebreak", &prefs.useStatusLinebreak);
+				readBoolEntry(tag, "transportStatus", &prefs.clTransportStatus);
+			}
+		}
+
 		QDomElement p_lnf = findSubTag(p, "lookandfeel", &found);
 		if(found) {
 			bool found;
 
-			readBoolEntry(p_lnf, "newHeadings", &prefs.clNewHeadings);
 			readBoolEntry(p_lnf, "outline-headings", &prefs.outlineHeadings);
 			readNumEntry(p_lnf, "chat-opacity", &prefs.chatOpacity);
 			readNumEntry(p_lnf, "roster-opacity", &prefs.rosterOpacity);
@@ -1615,6 +1673,7 @@
 				readEntry(tag, "message", &prefs.font[fMessage]);
 				readEntry(tag, "chat", &prefs.font[fChat]);
 				readEntry(tag, "popup", &prefs.font[fPopup]);
+				readEntry(tag, "statusmsg", &prefs.font[fStatusMes]);
 			}
 		}