X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=2790914914d79b274e13e5b5d1a318ca2bb03d47;hp=23f465f4df81b671e146e3bbc4aec3c05fa90bae;hb=d2ea95049c43f1fc3089109866757e45139d0d9a;hpb=1194f3fc55051969b9c992d3284ccc00f52f6698

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 23f465f..2790914 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -76,8 +76,11 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		tny_header_set_from (TNY_HEADER (header), from);
 		tny_header_set_replyto (TNY_HEADER (header), from);
 	}
-	if ((mailto != NULL) && (strlen(mailto) > 0)) 
-		tny_header_set_to (TNY_HEADER (header), mailto);
+	if ((mailto != NULL) && (strlen(mailto) > 0)) {
+		gchar *removed_to = modest_text_utils_remove_duplicate_addresses (mailto);
+		tny_header_set_to (TNY_HEADER (header), removed_to);
+		g_free (removed_to);
+	}
 	if ((cc != NULL) && (strlen(cc) > 0)) 
 		tny_header_set_cc (TNY_HEADER (header), cc);
 	if ((bcc != NULL) && (strlen(bcc) > 0)) 
@@ -462,19 +465,14 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	/* no parts? assume it's single-part message */
 	if (tny_iterator_is_done(iter)) {
 		gchar *content_type;
-		gchar *content_type_lower;
 		gboolean is_text_part;
 		g_object_unref (G_OBJECT(iter));
-		content_type = g_strdup (tny_mime_part_get_content_type (msg));
+		content_type = modest_tny_mime_part_get_content_type (msg);
 		if (content_type == NULL)
 			return NULL;
-		content_type = g_strstrip (content_type);
-		content_type_lower = g_ascii_strdown (content_type, -1);
-		g_free (content_type);
 		is_text_part = 
-			g_str_has_prefix (content_type_lower, "text/") ||
-			g_str_has_prefix (content_type_lower, "message/rfc822");
-		g_free (content_type_lower);
+			g_str_has_prefix (content_type, "text/");
+		g_free (content_type);
 		/* if this part cannot be a supported body return NULL */
 		if (!is_text_part) {
 			return NULL;
@@ -752,7 +750,7 @@ static gchar*
 get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	    ModestTnyMsgReplyMode reply_mode)
 {
-	const gchar* old_reply_to;
+	gchar* old_reply_to;
 	gchar* old_from;
 	gchar* new_to;
 	
@@ -768,12 +766,11 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 
 
 	/* reply to sender, use ReplyTo or From */
-	//old_reply_to = tny_header_get_replyto (header);
 	old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), 
 							      "Reply-To"); 
 	old_from     = tny_header_dup_from (header);
 	
-	if (!old_from &&  !old_reply_to) {
+	if (!old_from && !old_reply_to) {
 		g_warning ("%s: failed to get either Reply-To: or From: from header",
 			   __FUNCTION__);
 		return NULL;
@@ -789,6 +786,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 		/* otherwise use either Reply-To: (preferred) or From: */
 		new_to = g_strdup (old_reply_to ? old_reply_to : old_from);
 	g_free (old_from);
+	g_free (old_reply_to);
 
 	/* in case of ReplyAll, we need to add the Recipients in the old To: */
 	if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {