Index: plugins/itip-formatter/itip-view.c
===================================================================
--- plugins/itip-formatter/itip-view.c	(revision 33835)
+++ plugins/itip-formatter/itip-view.c	(working copy)
@@ -338,72 +338,80 @@
 	const char *organizer, *attendee;
 	char *sender = NULL;
 	char *on_behalf_of = NULL;
+	char *boldname, *boldorganizer, *boldattendee, *bolddelegator;
 
 	priv = view->priv;
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
 	attendee = priv->attendee ? priv->attendee : _("An unknown person");
 
+	boldname = g_strdup_printf("<b>%s</b>", priv->proxy);
+	/*FIXME: perhaps these should be moved to the cases? */
+	boldorganizer = g_strdup_printf("<b>%s</b>", organizer);
+	boldattendee = g_strdup_printf("<b>%s</b>", attendee);
+	bolddelegator = g_strdup_printf("<b>%s</b>", priv->delegator);
+
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Please respond on behalf of %s"), boldname);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Received on behalf of %s"), boldname);
+	g_free (boldname);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has published the following meeting information:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has published the following meeting information:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has published the following meeting information:"), organizer);
+			sender = g_strdup_printf (_("%s has published the following meeting information:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
 		/* FIXME is the delegator stuff handled correctly here? */
 		if (priv->delegator) {
-			sender = g_strdup_printf (_("<b>%s</b> has delegated the following meeting to you:"), priv->delegator);
+			sender = g_strdup_printf (_("%s has delegated the following meeting to you:"), bolddelegator);
 		} else {
 			if (priv->organizer_sentby)
-				sender = g_strdup_printf (_("<b>%s</b> through %s requests your presence at the following meeting:"), organizer, priv->organizer_sentby);
+				sender = g_strdup_printf (_("%s through %s requests your presence at the following meeting:"), boldorganizer, priv->organizer_sentby);
 			else
-				sender = g_strdup_printf (_("<b>%s</b> requests your presence at the following meeting:"), organizer);
+				sender = g_strdup_printf (_("%s requests your presence at the following meeting:"), boldorganizer);
 		}
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to add to an existing meeting:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s wishes to add to an existing meeting:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> wishes to add to an existing meeting:"), organizer);
+			sender = g_strdup_printf (_("%s wishes to add to an existing meeting:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s wishes to receive the latest information for the following meeting:"), boldattendee, priv->attendee_sentby);
 		else		
-			sender = g_strdup_printf (_("<b>%s</b> wishes to receive the latest information for the following meeting:"), attendee);
+			sender = g_strdup_printf (_("%s wishes to receive the latest information for the following meeting:"), boldattendee);
 		break;
 	case ITIP_VIEW_MODE_REPLY:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has sent back the following meeting response:"), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s has sent back the following meeting response:"), boldattendee, priv->attendee_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has sent back the following meeting response:"), attendee);
+			sender = g_strdup_printf (_("%s has sent back the following meeting response:"), boldattendee);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following meeting:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has canceled the following meeting:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has canceled the following meeting."), organizer);
+			sender = g_strdup_printf (_("%s has canceled the following meeting."), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s has proposed the following meeting changes."), boldorganizer, priv->attendee_sentby);
 		else 
-			sender = g_strdup_printf (_("<b>%s</b> has proposed the following meeting changes."), attendee);
+			sender = g_strdup_printf (_("%s has proposed the following meeting changes."), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has declined the following meeting changes:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has declined the following meeting changes:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has declined the following meeting changes."), organizer);
+			sender = g_strdup_printf (_("%s has declined the following meeting changes."), boldorganizer);
 		break;
 	default:
 		break;
@@ -417,6 +425,9 @@
 
 	g_free (on_behalf_of);
 	g_free (sender);
+	g_free (boldorganizer);
+	g_free (boldattendee);
+	g_free (bolddelegator);
 }
 
 static void
@@ -426,72 +437,79 @@
 	const char *organizer, *attendee;
 	char *sender = NULL;
 	char *on_behalf_of = NULL;
+	char *boldname, *boldorganizer, *boldattendee;
 
 	priv = view->priv;
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
 	attendee = priv->attendee ? priv->attendee : _("An unknown person");
-	
+
+	boldname = g_strdup_printf("<b>%s</b>", priv->proxy);
+	/*FIXME: perhaps these should be moved to the cases? */
+	boldorganizer = g_strdup_printf("<b>%s</b>", organizer);
+	boldattendee = g_strdup_printf("<b>%s</b>", attendee);
+
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Please respond on behalf of %s"), boldname);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Received on behalf of %s"), boldname);
+	g_free (boldname);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has published the following task:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has published the following task:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has published the following task:"), organizer);
+			sender = g_strdup_printf (_("%s has published the following task:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_REQUEST:
 		/* FIXME is the delegator stuff handled correctly here? */
 		if (priv->delegator) {
-			sender = g_strdup_printf (_("<b>%s</b> requests the assignment of %s to the following task:"), organizer, priv->delegator);
+			sender = g_strdup_printf (_("%s requests the assignment of %s to the following task:"), boldorganizer, priv->delegator);
 		} else {
 			if (priv->organizer_sentby)
-				sender = g_strdup_printf (_("<b>%s</b> through %s has assigned you a task:"), organizer, priv->organizer_sentby);
+				sender = g_strdup_printf (_("%s through %s has assigned you a task:"), boldorganizer, priv->organizer_sentby);
 			else
-				sender = g_strdup_printf (_("<b>%s</b> has assigned you a task:"), organizer);
+				sender = g_strdup_printf (_("%s has assigned you a task:"), boldorganizer);
 		}
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to add to an existing task:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s wishes to add to an existing task:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> wishes to add to an existing task:"), organizer);
+			sender = g_strdup_printf (_("%s wishes to add to an existing task:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_REFRESH:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s wishes to receive the latest information for the following assigned task:"), boldattendee, priv->attendee_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> wishes to receive the latest information for the following assigned task:"), attendee);
+			sender = g_strdup_printf (_("%s wishes to receive the latest information for the following assigned task:"), boldattendee);
 		break;
 	case ITIP_VIEW_MODE_REPLY:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has sent back the following assigned task response:"), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s has sent back the following assigned task response:"), boldattendee, priv->attendee_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has sent back the following assigned task response:"), attendee);
+			sender = g_strdup_printf (_("%s has sent back the following assigned task response:"), boldattendee);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following assigned task:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has canceled the following assigned task:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has canceled the following assigned task:"), organizer);
+			sender = g_strdup_printf (_("%s has canceled the following assigned task:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has proposed the following task assignment changes:"), attendee, priv->attendee_sentby);
+			sender = g_strdup_printf (_("%s through %s has proposed the following task assignment changes:"), boldattendee, priv->attendee_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has proposed the following task assignment changes:"), attendee);
+			sender = g_strdup_printf (_("%s has proposed the following task assignment changes:"), boldattendee);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has declined the following assigned task:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has declined the following assigned task:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has declined the following assigned task:"), organizer);
+			sender = g_strdup_printf (_("%s has declined the following assigned task:"), boldorganizer);
 		break;
 	default:
 		break;
@@ -505,6 +523,8 @@
 
 	g_free (on_behalf_of);
 	g_free (sender);
+	g_free (boldorganizer);
+	g_free (boldattendee);
 }
 
 static void
@@ -514,37 +534,42 @@
 	const char *organizer, *attendee;
 	char *sender = NULL;
 	char *on_behalf_of = NULL;
+	char *boldname, *boldorganizer;
 
 	priv = view->priv;
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
 	attendee = priv->attendee ? priv->attendee : _("An unknown person");
+
+	boldname = g_strdup_printf("<b>%s</b>", priv->proxy);
+	/*FIXME: perhaps this should be moved to the cases? */
+	boldorganizer = g_strdup_printf("<b>%s</b>", organizer);
 	
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Please respond on behalf of %s"), boldname);
 	else if (priv->attendee && priv->proxy)
-		on_behalf_of = g_strdup_printf (_("Received on behalf of <b>%s</b>"), priv->proxy);
+		on_behalf_of = g_strdup_printf (_("Received on behalf of %s"), boldname);
 
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has published the following memo:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has published the following memo:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has published the following memo:"), organizer);
+			sender = g_strdup_printf (_("%s has published the following memo:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_ADD:
 		/* FIXME What text for this? */
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to add to an existing memo:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s wishes to add to an existing memo:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> wishes to add to an existing memo:"), organizer);
+			sender = g_strdup_printf (_("%s wishes to add to an existing memo:"), boldorganizer);
 		break;
 	case ITIP_VIEW_MODE_CANCEL:
 		if (priv->organizer_sentby)
-			sender = g_strdup_printf (_("<b>%s</b> through %s has canceled the following shared memo:"), organizer, priv->organizer_sentby);
+			sender = g_strdup_printf (_("%s through %s has canceled the following shared memo:"), boldorganizer, priv->organizer_sentby);
 		else
-			sender = g_strdup_printf (_("<b>%s</b> has canceled the following shared memo:"), organizer);
+			sender = g_strdup_printf (_("%s has canceled the following shared memo:"), boldorganizer);
 		break;
 	default:
 		break;
@@ -558,6 +583,7 @@
 
 	g_free (on_behalf_of);
 	g_free (sender);
+	g_free (boldorganizer);
 }
 
 
