Index: src/protocols/jabber/presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.47
diff -u -p -r1.47 presence.c
--- src/protocols/jabber/presence.c	19 Jun 2004 20:54:13 -0000	1.47
+++ src/protocols/jabber/presence.c	7 Jul 2004 17:48:34 -0000
@@ -86,17 +86,18 @@ void jabber_presence_send(GaimConnection
 	xmlnode *presence;
 	char *stripped = NULL;
 
+	if(gc->away)
+		g_free(gc->away);
+	gc->away = NULL;
+
 	if(msg) {
 		gaim_markup_html_to_xhtml(msg, NULL, &stripped);
+		gc->away = stripped;
 	} else if(!state || strcmp(state, GAIM_AWAY_CUSTOM)) {
 		/* i can't wait until someone re-writes the status/away stuff */
 		stripped = g_strdup("");
 	}
 
-	if(gc->away)
-		g_free(gc->away);
-	gc->away = stripped;
-
 	presence = jabber_presence_create(state, stripped);
 	jabber_send(js, presence);
 	g_hash_table_foreach(js->chats, chats_send_presence_foreach, presence);