diff -X exclude -Nur psi-2005.03.03-eat/psi/src/common.h psi-2005.03.03-eat-rr/psi/src/common.h
--- psi-2005.03.03-eat/psi/src/common.h	Thu Mar  3 01:43:16 2005
+++ psi-2005.03.03-eat-rr/psi/src/common.h	Thu Mar  3 01:46:26 2005
@@ -119,7 +119,7 @@
 	QString customBrowser, customMailer;
 
 	bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats;
-	bool emoticonsInChatDlg, emoticonsInEventDlg, emoticonsInGroupChatDlg, emoticonsInPopup, emoticonsInToolTip;
+	bool emoticonsInChatDlg, emoticonsInEventDlg, emoticonsInGroupChatDlg, emoticonsInPopup, emoticonsInToolTip, emoticonsInRoster;
 	bool raiseChatWindow, showSubjects, showCounter, chatSays, chatSoftReturn, showGroupCounts;
 
 	QSize sizeEventDlg, sizeChatDlg;
diff -X exclude -Nur psi-2005.03.03-eat/psi/src/contactview.cpp psi-2005.03.03-eat-rr/psi/src/contactview.cpp
--- psi-2005.03.03-eat/psi/src/contactview.cpp	Thu Mar  3 01:40:04 2005
+++ psi-2005.03.03-eat-rr/psi/src/contactview.cpp	Thu Mar  3 01:48:58 2005
@@ -2631,7 +2631,7 @@
 		const UserResource &r = *(srl.begin());
 		// status description
 		ins = linkify(expandEntities(r.status().status().stripWhiteSpace()));
-		if(option.useEmoticons)
+		if(option.useEmoticons && option.emoticonsInRoster)
 			ins = emoticonify(ins);
 		ins.replace("\n", "<br>");
 		if(option.templFieldTrim > 0 ){
@@ -2668,7 +2668,7 @@
 	} else {
 		// status description
 		ins = linkify(expandEntities(d->u->lastUnavailableStatus().status().stripWhiteSpace()));
-		if(option.useEmoticons)
+		if(option.useEmoticons && option.emoticonsInRoster)
 			ins = emoticonify(ins);
 		ins.replace("\n", "<br>");
 		if(option.templFieldTrim > 0 ){
diff -X exclude -Nur psi-2005.03.03-eat/psi/src/options/opt_iconset.cpp psi-2005.03.03-eat-rr/psi/src/options/opt_iconset.cpp
--- psi-2005.03.03-eat/psi/src/options/opt_iconset.cpp	Thu Mar  3 01:35:18 2005
+++ psi-2005.03.03-eat-rr/psi/src/options/opt_iconset.cpp	Thu Mar  3 01:44:42 2005
@@ -464,6 +464,7 @@
 	opt->emoticonsInGroupChatDlg = d->ck_emotGroupChat->isChecked();
 	opt->emoticonsInPopup = d->ck_emotPopup->isChecked();
 	opt->emoticonsInToolTip = d->ck_emotTooltip->isChecked();
+	opt->emoticonsInRoster = d->ck_emotRoster->isChecked();
 
 	opt->emoticons.clear();
 	IconWidgetItem *item = (IconWidgetItem *)d->iss_emoticons->firstItem();
@@ -493,6 +494,7 @@
 	d->ck_emotGroupChat->setChecked( opt->emoticonsInGroupChatDlg );
 	d->ck_emotPopup->setChecked( opt->emoticonsInPopup );
 	d->ck_emotTooltip->setChecked( opt->emoticonsInToolTip );
+	d->ck_emotRoster->setChecked( opt->emoticonsInRoster );
 
 	// fill in the iconset view
 	d->iss_emoticons->clear();
diff -X exclude -Nur psi-2005.03.03-eat/psi/src/options/opt_iconset_emo.ui psi-2005.03.03-eat-rr/psi/src/options/opt_iconset_emo.ui
--- psi-2005.03.03-eat/psi/src/options/opt_iconset_emo.ui	Thu Mar  3 01:35:18 2005
+++ psi-2005.03.03-eat-rr/psi/src/options/opt_iconset_emo.ui	Thu Mar  3 01:44:42 2005
@@ -92,6 +92,14 @@
                         <string>In Tooltip</string>
                     </property>
                 </widget>
+                <widget class="QCheckBox" row="2" column="1">
+                    <property name="name">
+                        <cstring>ck_emotRoster</cstring>
+                    </property>
+                    <property name="text">
+                        <string>In Roster</string>
+                    </property>
+                </widget>
             </grid>
         </widget>       
         <widget class="QGroupBox">
diff -X exclude -Nur psi-2005.03.03-eat/psi/src/psi_profiles.cpp psi-2005.03.03-eat-rr/psi/src/psi_profiles.cpp
--- psi-2005.03.03-eat/psi/src/psi_profiles.cpp	Thu Mar  3 01:40:04 2005
+++ psi-2005.03.03-eat-rr/psi/src/psi_profiles.cpp	Thu Mar  3 01:44:42 2005
@@ -395,6 +395,7 @@
 	prefs.emoticonsInGroupChatDlg = true;
 	prefs.emoticonsInPopup = true;
 	prefs.emoticonsInToolTip = true;
+	prefs.emoticonsInRoster = true;
 	prefs.alertOpenChats = false;
 	prefs.raiseChatWindow = false;
 	prefs.showSubjects = true;
@@ -819,6 +820,7 @@
 			p_misc.appendChild(textTag(doc, "emoticonsInGroupChatDlg", prefs.emoticonsInGroupChatDlg));
 			p_misc.appendChild(textTag(doc, "emoticonsInPopup", prefs.emoticonsInPopup));
 			p_misc.appendChild(textTag(doc, "emoticonsInToolTip", prefs.emoticonsInToolTip));
+			p_misc.appendChild(textTag(doc, "emoticonsInRoster", prefs.emoticonsInRoster));
 			p_misc.appendChild(textTag(doc, "alertOpenChats", prefs.alertOpenChats));
 			p_misc.appendChild(textTag(doc, "raiseChatWindow", prefs.raiseChatWindow));
 			p_misc.appendChild(textTag(doc, "showSubjects", prefs.showSubjects));
@@ -1380,6 +1382,7 @@
 				readBoolEntry(tag, "emoticonsInGroupChatDlg", &prefs.emoticonsInGroupChatDlg);
 				readBoolEntry(tag, "emoticonsInPopup", &prefs.emoticonsInPopup);
 				readBoolEntry(tag, "emoticonsInToolTip", &prefs.emoticonsInToolTip);
+				readBoolEntry(tag, "emoticonsInRoster", &prefs.emoticonsInRoster);
 				readBoolEntry(tag, "alertOpenChats", &prefs.alertOpenChats);
 				readBoolEntry(tag, "raiseChatWindow", &prefs.raiseChatWindow);
 				readBoolEntry(tag, "showSubjects", &prefs.showSubjects);