--- src/gtkblist.c.orig	Thu Aug 26 05:47:00 2004
+++ src/gtkblist.c	Tue Aug 31 16:03:52 2004
@@ -2711,6 +2711,7 @@
 	int ihrs, imin;
 	char *idletime = NULL, *warning = NULL, *statustext = NULL;
 	time_t t;
+	char combimdname[1024];
 	/* XXX Clean up this crap */
 
 	contact = (GaimContact*)((GaimBlistNode*)b)->parent;
@@ -2721,6 +2722,11 @@
 		name = contact->alias;
 	else
 		name = gaim_buddy_get_alias(b);
+	if(b && b->alias && b->alias[0] && b->server_alias) {
+		snprintf(combimdname, sizeof(combimdname), "[%s] %s",
+				b->alias, b->server_alias);
+		name=combimdname;
+	}
 	esc = g_markup_escape_text(name, strlen(name));
 
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));