Index: rb-shell.c
===================================================================
--- rb-shell.c	(revision 5381)
+++ rb-shell.c	(working copy)
@@ -2930,7 +2930,7 @@
 				  RhythmDBEntry *entry)
 {
 	GValue *value;
-	char *stream_title = NULL;
+	const char *stream_title = NULL;
 	char *artist = NULL;
 	char *album = NULL;
 	char *title = NULL;
@@ -2993,22 +2993,25 @@
 						       entry,
 						       RHYTHMDB_PROP_STREAM_SONG_TITLE);
 	if (value != NULL) {
-		title = markup_escape (g_value_get_string (value));
+		title = g_value_dup_string (value);
 		g_value_unset (value);
 		g_free (value);
 
-		stream_title = markup_escape (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
+		stream_title = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE);
 	} else {
-		title = markup_escape (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
+		title = g_strdup (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));
 	}
 
 	if (stream_title != NULL && stream_title[0] != '\0') {
+		char *escaped;
+
+		escaped = markup_escape (stream_title);
 		if (secondary->len == 0)
-			g_string_append (secondary, stream_title);
+			g_string_append (secondary, escaped);
 		else
-			g_string_append_printf (secondary, " (%s)", stream_title);
+			g_string_append_printf (secondary, " (%s)", escaped);
+		g_free (escaped);
 	}
-	g_free (stream_title);
 
 	if (title != NULL)
 		shell->priv->cached_notify_primary = title;
Index: shell/rb-shell.c
===================================================================
--- shell/rb-shell.c	(revision 5414)
+++ shell/rb-shell.c	(working copy)
@@ -1964,7 +1964,7 @@
 
 	rb_shell_notify_playing_entry (shell, entry, FALSE);
 
-	rb_tray_icon_set_tooltip_primary_markup (shell->priv->tray_icon, shell->priv->cached_notify_primary);
+	rb_tray_icon_set_tooltip_primary_text (shell->priv->tray_icon, shell->priv->cached_notify_primary);
 	rb_tray_icon_set_tooltip_icon (shell->priv->tray_icon, shell->priv->cached_art_icon);
 	rb_shell_update_tray_tooltip_elapsed (shell);
 }
@@ -2044,7 +2044,7 @@
 	 */
 	entry = rb_shell_player_get_playing_entry (shell->priv->player_shell);
 	rb_shell_construct_notify_titles (shell, entry);
-	rb_tray_icon_set_tooltip_primary_markup (shell->priv->tray_icon, shell->priv->cached_notify_primary);
+	rb_tray_icon_set_tooltip_primary_text (shell->priv->tray_icon, shell->priv->cached_notify_primary);
 	rb_shell_update_tray_tooltip_elapsed (shell);
 	
 	if (entry)
Index: shell/rb-tray-icon.c
===================================================================
--- shell/rb-tray-icon.c	(revision 5414)
+++ shell/rb-tray-icon.c	(working copy)
@@ -640,16 +640,16 @@
 }
 
 void
-rb_tray_icon_set_tooltip_primary_markup (RBTrayIcon *icon,
-					 const char *primary_markup)
+rb_tray_icon_set_tooltip_primary_text (RBTrayIcon *icon,
+				       const char *primary_text)
 {
 	/* hide, then reshow in the right position & size */
 	gtk_widget_hide (icon->priv->tooltip);
 
-	if (primary_markup == NULL)
-		primary_markup = TRAY_ICON_DEFAULT_TOOLTIP;
-	gtk_label_set_markup (GTK_LABEL (icon->priv->tooltip_primary),
-			      primary_markup);
+	if (primary_text == NULL)
+		primary_text = TRAY_ICON_DEFAULT_TOOLTIP;
+	gtk_label_set_text (GTK_LABEL (icon->priv->tooltip_primary),
+			    primary_text);
 
 	if (icon->priv->tooltip_unhide_id > 0)
 		g_source_remove (icon->priv->tooltip_unhide_id);
Index: shell/rb-tray-icon.h
===================================================================
--- shell/rb-tray-icon.h	(revision 5414)
+++ shell/rb-tray-icon.h	(working copy)
@@ -66,7 +66,7 @@
 
 void                    rb_tray_icon_cancel_notify (RBTrayIcon *icon);
 
-void rb_tray_icon_set_tooltip_primary_markup (RBTrayIcon *icon, const char *primary_markup);
+void rb_tray_icon_set_tooltip_primary_text (RBTrayIcon *icon, const char *primary_text);
 void rb_tray_icon_set_tooltip_icon (RBTrayIcon *icon, GtkWidget *msgicon);
 void rb_tray_icon_set_tooltip_secondary_markup (RBTrayIcon *icon, const char *secondary_markup);