diff --git a/src/mu-msg-file.c b/src/mu-msg-file.c
index 96563eb1..f7e363ec 100644
--- a/src/mu-msg-file.c
+++ b/src/mu-msg-file.c
@@ -181,18 +181,20 @@ init_mime_msg (MuMsgFile *self, const char* path, GError **err)
 static char*
 get_recipient (MuMsgFile *self, GMimeRecipientType rtype)
 {
-	char *recep;
-	InternetAddressList *receps;
+	char *recip;
+	InternetAddressList *recips;
 	
-	receps = g_mime_message_get_recipients (self->_mime_msg, rtype);
-	recep = (char*)internet_address_list_to_string (receps, TRUE);
+	recips = g_mime_message_get_recipients (self->_mime_msg, rtype);
+
+	/* FALSE --> don't encode */
+	recip = (char*)internet_address_list_to_string (recips, FALSE);
 	
-	if (mu_str_is_empty(recep)) {
-		g_free (recep);
+	if (mu_str_is_empty(recip)) {
+		g_free (recip);
 		return NULL;
 	}
 
-	return recep;
+	return recip;
 }
 
 
diff --git a/src/tests/test-mu-msg.c b/src/tests/test-mu-msg.c
index 7ee3bef1..5832d43b 100644
--- a/src/tests/test-mu-msg.c
+++ b/src/tests/test-mu-msg.c
@@ -219,7 +219,7 @@ test_mu_msg_05 (void)
 {
 		MuMsg *msg;
 
-		msg = mu_msg_new (MU_TESTMAILDIR
+		msg = mu_msg_new_from_file (MU_TESTMAILDIR
 						  "cur/1305664394.2171_402.cthulhu!2,",
 						  NULL, NULL);