diff -r c432ca78c271 -r 240e5b90adb4 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Mon Apr 24 20:05:48 2006 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Apr 24 20:15:34 2006 +0000
@@ -153,14 +153,12 @@
 		status = YAHOO_STATUS_TYPE_INVISIBLE;
 		break;
 	case YAHOO_STATUS_CUSTOM:
+	case YAHOO_STATUS_IDLE:
 		if (!f->away)
 			status = YAHOO_STATUS_TYPE_AVAILABLE;
 		else
 			status = YAHOO_STATUS_TYPE_AWAY;
 		break;
-	case YAHOO_STATUS_IDLE:
-		status = YAHOO_STATUS_TYPE_AVAILABLE;
-		break;
 	default:
 		gaim_debug_warning("yahoo", "Warning, unknown status %d\n", f->status);
 		break;
@@ -3237,7 +3235,7 @@
 	char *msg = NULL, *msg2 = NULL;
 	GaimStatus *status = NULL;
 
-	if (idle && yd->current_status != YAHOO_STATUS_IDLE)
+	if (idle && yd->current_status != YAHOO_STATUS_CUSTOM)
 		yd->current_status = YAHOO_STATUS_IDLE;
 	else if (!idle && yd->current_status == YAHOO_STATUS_IDLE) {
 		status = gaim_presence_get_active_status(gaim_account_get_presence(gaim_connection_get_account(gc)));