--- a/src/idle.c	Thu Aug 05 16:44:48 2004 +0000
+++ b/src/idle.c	Thu Aug 05 17:11:10 2004 +0000
@@ -90,7 +90,8 @@
 		(idle_time > (60 * gaim_prefs_get_int("/core/away/mins_before_away")))
 		&& (!gc->is_auto_away)) {
 
-		if (!gc->away) {
+		if (!gc->away && !*gc->away && (!gc->away_state ||
+					!strcmp(gc->away_state, GAIM_AWAY_CUSTOM))) {
 			struct away_message *default_away = NULL;
 			const char *default_name;
 			GSList *l;