diff -ru -X exclude psi-clean/src/contactview.cpp psi/src/contactview.cpp
--- psi-clean/src/contactview.cpp	Tue Nov 04 07:12:56 2003
+++ psi/src/contactview.cpp	Tue Nov 11 12:39:18 2003
@@ -1674,7 +1683,7 @@
 		return;
 	QRect r(itemRect(i));
 	if(i->type() == ContactViewItem::Contact)
-		tip(r, i->u()->makeTip(true, false));
+		tip(r, i->u()->makeTip(true, true));
 	else if(i->type() == ContactViewItem::Profile) {
-		tip(r, i->contactProfile()->makeTip(true, false));
+		tip(r, i->contactProfile()->makeTip(true, true));
	}
diff -ru -X exclude psi-clean/src/psipopup.cpp psi/src/psipopup.cpp
--- psi-clean/src/psipopup.cpp	Tue Oct 28 18:05:50 2003
+++ psi/src/psipopup.cpp	Tue Nov 11 12:14:36 2003
@@ -334,7 +334,7 @@
 	else
 		name = "<nobr>&lt;" + jid + "&gt;</nobr>";
 
-	QString statusString = plain2rich(status);
+	QString statusString = linkify(plain2rich(status));
 	if ( option.useEmoticons && option.emoticonsInPopup )
 		statusString = emoticonify(statusString);
 
diff -ru -X exclude psi-clean/src/userlist.cpp psi/src/userlist.cpp
--- psi-clean/src/userlist.cpp	Mon Oct 27 23:42:38 2003
+++ psi/src/userlist.cpp	Tue Nov 11 12:43:50 2003
@@ -398,7 +404,7 @@
 					s = plain2rich(s);
 				if ( doLinkify )
 					s = linkify(s);
-				if( option.useEmoticons && option.emoticonsInToolTip && !doLinkify )
+				if( option.useEmoticons && option.emoticonsInToolTip )
 					s = emoticonify(s);
 				str += QString("<br><nobr><u>%1</u></nobr><br>%2").arg(head).arg(s);
 			}
@@ -419,14 +425,15 @@
 		// status message
 		QString s = lastUnavailableStatus().status();
 		if(!s.isEmpty()) {
-			QString head = QObject::tr("Last Status Message");
+			QString head = QObject::tr("Status Message");
 			if(trim)
 				s = plain2rich(clipStatus(s, 200, 12));
-			else {
-				s = plain2rich(clipStatus(s, 200, 12));
-				if ( doLinkify )
-					s = linkify(s);
-			}
+			else
+				s = plain2rich(s);
+			if ( doLinkify )
+				s = linkify(s);
+			if( option.useEmoticons )
+				s = emoticonify(s);
 			str += QString("<br><nobr><u>%1</u></nobr><br>%2").arg(head).arg(s);
 		}
 	}