diff -r 525bbe926760 -r 167358332f4b src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Thu Jan 19 07:36:38 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Thu Jan 19 18:09:06 2006 +0000
@@ -3226,29 +3226,29 @@
 
   str = g_string_new(NULL);
 
-  tmp = status_text(b);
-  g_string_append_printf(str, _("\n<b>Status</b>: %s"), tmp);
-
   tmp = mwServiceAware_getText(pd->srvc_aware, &idb);
   if(tmp) {
     tmp = g_markup_escape_text(tmp, -1);
-    g_string_append_printf(str, _("\n<b>Message</b>: %s"), tmp);
+    g_string_append_printf(str, _("\n<b>%s</b>: %s"), status_text(b), tmp);
     g_free((char *) tmp);
-  }
-
-  tmp = user_supports_text(pd->srvc_aware, b->name);
-  if(tmp) {
-    g_string_append_printf(str, _("\n<b>Supports</b>: %s"), tmp);
-    g_free((char *) tmp);
+
+  } else {
+    g_string_append_printf(str, _("\n<b>Status</b>: %s"), status_text(b));
   }
 
-  if(buddy_is_external(b)) {
-    g_string_append(str, _("\n<b>External User</b>"));
+  if(full) {
+    tmp = user_supports_text(pd->srvc_aware, b->name);
+    if(tmp) {
+      g_string_append_printf(str, _("\n<b>Supports</b>: %s"), tmp);
+      g_free((char *) tmp);
+    }
+
+    if(buddy_is_external(b)) {
+      g_string_append(str, _("\n<b>External User</b>"));
+    }
   }
 
-  tmp = str->str;
-  g_string_free(str, FALSE);
-  return (char *) tmp;
+  return g_string_free(str, FALSE);
 }
 
 
@@ -3257,7 +3257,7 @@
   GaimStatusType *type;
 
   type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, MW_STATE_ACTIVE,
-			      _("Available"), TRUE);
+			      NULL, TRUE);
   gaim_status_type_add_attr(type, MW_STATE_MESSAGE, _("Message"),
 			    gaim_value_new(GAIM_TYPE_STRING));
   types = g_list_append(types, type);