Index: composer/e-msg-composer.c
===================================================================
--- composer/e-msg-composer.c	(revision 33835)
+++ composer/e-msg-composer.c	(working copy)
@@ -2574,8 +2574,9 @@
 		E_ATTACHMENT_BAR (p->attachment_bar));
 	if (attachment_num) {
 		gchar *num_text = g_strdup_printf (
-			ngettext ("<b>%d</b> Attachment", "<b>%d</b> Attachments", attachment_num),
-			attachment_num);
+			const char *boldnr= "<b>%d</b>";
+			ngettext ("%s Attachment", "%s Attachments", attachment_num),
+			boldnr);
 		gtk_label_set_markup (GTK_LABEL (p->attachment_expander_num),
 				      num_text);
 		g_free (num_text);
@@ -5094,10 +5095,13 @@
 	EMsgComposerPrivate *p = composer->priv;
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	
-	set_editor_text (composer, _("<b>(The composer contains a non-text message body, which cannot be edited.)</b>"), -1, FALSE, FALSE);
+	gchar * msg = g_strdup_printf("<b>%s</b>", _("(The composer contains a non-text message body, which cannot be edited.)"));
+
+	set_editor_text (composer, msg, -1, FALSE, FALSE);
 	e_msg_composer_set_send_html (composer, FALSE);
 	disable_editor (composer);
-	
+	g_free(msg);	
+
 	g_free (p->mime_body);
 	p->mime_body = g_strdup (body);
 	g_free (p->mime_type);
