From 21a216acd200ba7e2622cf7d6c40180622ff8f49 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Sun, 7 Apr 2013 16:05:10 +0300
Subject: [PATCH] * cosmetic

---
 lib/mu-msg-file.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/mu-msg-file.c b/lib/mu-msg-file.c
index a5cfeb5a..9b795995 100644
--- a/lib/mu-msg-file.c
+++ b/lib/mu-msg-file.c
@@ -413,11 +413,10 @@ convert_to_utf8 (GMimePart *part, char *buffer)
 	charset = g_mime_content_type_get_parameter (ctype, "charset");
 	if (charset) {
 		char *utf8;
-		utf8 = mu_str_convert_to_utf8
-		         (buffer,  g_mime_charset_iconv_name (charset));
-		if (utf8) {
+		if ((utf8 = mu_str_convert_to_utf8
+		     (buffer, g_mime_charset_iconv_name (charset)))) {
 			g_free (buffer);
-			return utf8;
+			buffer = utf8;
 		}
 	} else if (!g_utf8_validate (buffer, -1, NULL)) {
 		/* if it's already utf8, nothing to do otherwise: no
@@ -492,7 +491,7 @@ mu_msg_mime_part_to_string (GMimePart *part, gboolean *err)
 
 	/* convert_to_utf8 will free the old 'buffer' if needed */
 	buffer = convert_to_utf8 (part, buffer);
-	*err = FALSE;
+	*err   = FALSE;
 
 cleanup:
 	if (G_IS_OBJECT(stream))