X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=b41d39046e0e488759ee7d210db060666b027164;hp=2d79deac53e187c861f8210e74d2be9c78429d12;hb=HEAD;hpb=bc13df76e4593a1510f50d68cb8e7ea0fdecb63d

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 2d79dea..b41d390 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -58,23 +58,41 @@ static void add_images (TnyMsg *msg, GList *attachments_list, GError **err);
 static char * get_content_type(const gchar *s);
 static gboolean is_ascii(const gchar *s);
 
+static TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html);
+static TnyMimePart* modest_tny_msg_find_calendar_from_mime_part  (TnyMimePart *msg);
+
+static void
+add_header_pairs (TnyMimePart *part, TnyList *header_pairs)
+{
+	TnyIterator *iterator;
+
+	iterator = tny_list_create_iterator (header_pairs);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyPair *current = (TnyPair *) tny_iterator_get_current (iterator);
+		tny_mime_part_set_header_pair (part, tny_pair_get_name (current), tny_pair_get_value (current));
+		g_object_unref (current);
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+}
 
 TnyMsg*
 modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
-		    const gchar *bcc, const gchar* subject, 
+		    const gchar *bcc, const gchar* subject,
 		    const gchar *references, const gchar *in_reply_to,
 		    const gchar *body,
-		    GList *attachments, gint *attached, GError **err)
+		    GList *attachments, gint *attached, TnyList *header_pairs, GError **err)
 {
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
 	gint tmp_attached = 0;
-	
+
 	/* Create new msg */
 	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
+	add_header_pairs (TNY_MIME_PART (new_msg), header_pairs);
 	header  = tny_msg_get_header (new_msg);
-	
+
 	if ((from != NULL) && (strlen(from) > 0)) {
 		tny_header_set_from (TNY_HEADER (header), from);
 		tny_header_set_replyto (TNY_HEADER (header), from);
@@ -84,12 +102,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		tny_header_set_to (TNY_HEADER (header), removed_to);
 		g_free (removed_to);
 	}
-	if ((cc != NULL) && (strlen(cc) > 0)) 
+	if ((cc != NULL) && (strlen(cc) > 0))
 		tny_header_set_cc (TNY_HEADER (header), cc);
-	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+	if ((bcc != NULL) && (strlen(bcc) > 0))
 		tny_header_set_bcc (TNY_HEADER (header), bcc);
-	
-	if ((subject != NULL) && (strlen(subject) > 0)) 
+
+	if ((subject != NULL) && (strlen(subject) > 0))
 		tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(body);
@@ -106,12 +124,12 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 
 	if (in_reply_to)
 		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to);
-	
+
 	/* Add the body of the new mail */
 	/* This is needed even if body is NULL or empty. */
 	add_body_part (new_msg, body, content_type);
 	g_free (content_type);
-		       
+
 	/* Add attachments */
 	if (attachments)
 		tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
@@ -128,7 +146,7 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 			       const gchar *bcc, const gchar* subject, 
 			       const gchar *references, const gchar *in_reply_to,
 			       const gchar *html_body, const gchar *plain_body,
-			       GList *attachments, GList *images, gint *attached, GError **err)
+			       GList *attachments, GList *images, gint *attached, TnyList *header_pairs, GError **err)
 {
 	TnyMsg *new_msg;
 	TnyHeader *header;
@@ -137,6 +155,7 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 	
 	/* Create new msg */
 	new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL));
+	add_header_pairs (TNY_MIME_PART (new_msg), header_pairs);
 	header  = tny_msg_get_header (new_msg);
 	
 	if ((from != NULL) && (strlen(from) > 0)) {
@@ -167,12 +186,12 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 
 	if (in_reply_to)
 		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to);
-	
-	/* Add the body of the new mail */	
+
+	/* Add the body of the new mail */
 	add_body_part (new_msg, plain_body, content_type);
 	add_html_body_part (new_msg, html_body);
 	g_free (content_type);
-		       
+
 	/* Add attachments */
 	tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
 	if (attached)
@@ -224,7 +243,7 @@ add_html_body_part (TnyMsg *msg,
 
 	/* Create the stream */
 	html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
-					(body, strlen(body)));
+				       (body, (body) ? strlen(body) : 0));
 
 	/* Create body part if needed */
 	html_body_part = modest_formatter_create_body_part (NULL, msg);
@@ -334,8 +353,8 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline
 
 		old_attachment = pos->data;
 		if (!tny_mime_part_is_purged (old_attachment)) {
-			const gchar *old_cid;
-			old_cid = tny_mime_part_get_content_id (old_attachment);
+			gchar *old_cid;
+			old_cid = g_strdup (tny_mime_part_get_content_id (old_attachment));
 			attachment_part = copy_mime_part (old_attachment, err);
 			if (attachment_part != NULL) {
 				if (add_inline) {
@@ -343,20 +362,30 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline
 								       "inline");
 				} else {
 					const gchar *filename;
+
 					filename = tny_mime_part_get_filename (old_attachment);
-					if (filename)
-						tny_mime_part_set_filename (attachment_part, filename);
-					else
+					if (filename) {
+						/* If the mime part has a filename do not set it again
+						   because Camel won't replace the old one. Instead it
+						   will append the filename to the old one and that will
+						   mislead email clients */
+						if (!tny_mime_part_get_filename (attachment_part))
+							tny_mime_part_set_filename (attachment_part, filename);
+					} else {
 						tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
 									       "attachment");
+					}
+				}
+				if (!TNY_IS_MSG (old_attachment))  {
+					tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
 				}
-				tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
 				ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
 				attached++;
 				if (old_cid)
 					tny_mime_part_set_content_id (attachment_part, old_cid);
 				g_object_unref (attachment_part);
 			}
+			g_free (old_cid);
 		}
 	}
 	return attached;
@@ -380,7 +409,7 @@ add_images (TnyMsg *msg, GList *images_list, GError **err)
 
 		while (!tny_iterator_is_done (iter)) {
 			TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
-			if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
+			if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
 				related_part = part;
 				break;
 			}
@@ -442,10 +471,232 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 }
 
 
-TnyMimePart*
-modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
+static TnyMimePart*
+modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_html)
 {
+	TnyList *parts;
+	TnyIterator *iter;
+	TnyMimePart *part = NULL, *related = NULL;
+	TnyMimePart *first_part = NULL;
 	const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
+
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+
+	for (iter  = tny_list_create_iterator(parts);
+	     !tny_iterator_is_done (iter);
+	     tny_iterator_next (iter)) {
+		gchar *content_type;
+		gboolean is_body;
+
+		part = TNY_MIME_PART (tny_iterator_get_current (iter));
+
+		if (first_part == NULL) {
+			g_object_ref (part);
+			first_part = part;
+		}
+
+		is_body = FALSE;
+		content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+		is_body = g_str_has_prefix (content_type, desired_mime_type);
+		if (is_body)
+			break;
+
+		/* Makes no sense to look for related MIME parts if we
+		   only want the plain text parts */
+		if (want_html && g_str_has_prefix (content_type, "multipart/related")) {
+			/* In an alternative the last part is supposed
+			   to be the richest */
+			if (related)
+				g_object_unref (related);
+			related = g_object_ref (part);
+		}
+
+		g_object_unref (part);
+		part = NULL;
+
+	}
+	g_object_unref (iter);
+	g_object_unref (parts);
+
+	if (part == NULL) {
+		if (related) {
+			TnyMimePart *retval;
+			if (first_part)
+				g_object_unref (first_part);
+			retval = modest_tny_msg_find_body_part_from_mime_part (related, want_html);
+			g_object_unref (related);
+			return retval;
+		} else {
+			return first_part;
+		}
+	} else {
+		if (first_part)
+			g_object_unref (first_part);
+		if (related)
+			g_object_unref (related);
+		return part;
+	}
+}
+
+static TnyMimePart*
+modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
+{
+	TnyMimePart *part = NULL;
+	TnyList *parts = NULL;
+	TnyIterator *iter = NULL;
+	gchar *header_content_type;
+	gchar *header_content_type_lower = NULL;
+	gboolean is_related = FALSE;
+
+	if (!msg)
+		return NULL;
+
+	/* If it's an application multipart, then we don't get into as we don't
+	 * support them (for example application/sml or wap messages */
+	header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type");
+	if (header_content_type) {
+		header_content_type = g_strstrip (header_content_type);
+		header_content_type_lower = g_ascii_strdown (header_content_type, -1);
+	}
+	if (header_content_type_lower &&
+	    g_str_has_prefix (header_content_type_lower, "multipart/") &&
+	    !g_str_has_prefix (header_content_type_lower, "multipart/signed") &&
+	    strstr (header_content_type_lower, "application/")) {
+		g_free (header_content_type_lower);
+		g_free (header_content_type);
+		return NULL;
+	}
+	if (header_content_type_lower && 
+	    g_str_has_prefix (header_content_type_lower, "multipart/alternative")) {
+		g_free (header_content_type_lower);
+		g_free (header_content_type);
+		return modest_tny_msg_find_body_part_in_alternative (msg, want_html);
+	}
+
+	if (header_content_type_lower &&
+	    g_str_has_prefix (header_content_type_lower, "multipart/related"))
+		is_related = TRUE;
+
+	g_free (header_content_type_lower);
+	g_free (header_content_type);
+
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+
+	/* no parts? assume it's single-part message */
+	iter  = tny_list_create_iterator (parts);
+	if (tny_iterator_is_done(iter)) {
+		gchar *content_type;
+		gboolean is_text_part;
+
+		content_type = modest_tny_mime_part_get_content_type (msg);
+		if (content_type == NULL)
+			goto frees;
+		is_text_part = 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)
+			part = TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+	} else {
+		TnyMimePart *fallback = NULL;
+		do {
+			gchar *tmp, *content_type = NULL;
+			gboolean has_content_disp_name = FALSE;
+
+			part = TNY_MIME_PART(tny_iterator_get_current (iter));
+
+			if (!part) {
+				g_warning ("%s: not a valid mime part", __FUNCTION__);
+				tny_iterator_next (iter);
+				continue;
+			}
+
+			/* it's a message --> ignore */
+			if (part && TNY_IS_MSG (part)) {
+				g_object_unref (part);
+				part = NULL;
+				tny_iterator_next (iter);
+				continue;
+			}			
+
+			/* we need to strdown the content type, because
+			 * tny_mime_part_has_content_type does not do it...
+			 */
+			content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+
+			/* mime-parts with a content-disposition header (either 'inline' or 'attachment')
+			 * and a 'name=' thingy cannot be body parts
+                         */
+
+			tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
+			if (tmp) {
+				gchar *content_disp = g_ascii_strdown(tmp, -1);
+				g_free (tmp);
+				has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
+				g_free (content_disp);
+			}
+
+			if (g_str_has_prefix (content_type, "text/") &&
+			    !has_content_disp_name &&
+			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
+				/* We found that some multipart/related emails include
+				   empty text/plain parts at the end that could confuse the body
+				   detection algorithm */
+				if (is_related && g_str_has_prefix (content_type, "text/plain")) {
+					fallback = g_object_ref (part);
+				} else {
+					/* we found the body. Doesn't have to be the desired mime part, first
+					   text/ part in a multipart/mixed is the body */
+					g_free (content_type);
+					break;
+				}
+			} else if (g_str_has_prefix(content_type, "multipart/alternative")) {
+
+				/* multipart? recurse! */
+				g_object_unref (part);
+				g_free (content_type);
+				part = modest_tny_msg_find_body_part_in_alternative (part, want_html);
+				if (part)
+					break;
+
+			} else 	if (g_str_has_prefix(content_type, "multipart")) {
+
+				/* multipart? recurse! */
+				g_object_unref (part);
+				g_free (content_type);
+				part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
+				if (part)
+					break;
+			} else {
+				g_free (content_type);
+			}
+
+			if (part) {
+				g_object_unref (G_OBJECT(part));
+				part = NULL;
+			}
+			tny_iterator_next (iter);
+
+		} while (!tny_iterator_is_done(iter));
+
+		if (!part && fallback)
+			part = g_object_ref (fallback);
+		if (fallback)
+			g_object_unref (fallback);
+	}
+
+ frees:
+	g_object_unref (G_OBJECT(iter));
+	g_object_unref (G_OBJECT(parts));
+
+	return part;
+}
+
+static TnyMimePart*
+modest_tny_msg_find_calendar_from_mime_part (TnyMimePart *msg)
+{
 	TnyMimePart *part = NULL;
 	TnyList *parts = NULL;
 	TnyIterator *iter = NULL;
@@ -481,16 +732,16 @@ 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;
-		gboolean is_text_part;
+		gboolean is_calendar_part;
 		g_object_unref (G_OBJECT(iter));
 		content_type = modest_tny_mime_part_get_content_type (msg);
 		if (content_type == NULL)
 			return NULL;
-		is_text_part = 
-			g_str_has_prefix (content_type, "text/");
+		is_calendar_part = 
+			g_str_has_prefix (content_type, "text/calendar");
 		g_free (content_type);
 		/* if this part cannot be a supported body return NULL */
-		if (!is_text_part) {
+		if (!is_calendar_part) {
 			return NULL;
 		} else {
 			return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
@@ -533,10 +784,11 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				g_free (content_disp);
 			}
 			
-			if (g_str_has_prefix (content_type, desired_mime_type) && 
+			if (g_str_has_prefix (content_type, "text/calendar") && 
 			    !has_content_disp_name &&
 			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
-				/* we found the desired mime-type! */
+				/* we found the body. Doesn't have to be the desired mime part, first
+				   text/ part in a mixed is the body */
 				g_free (content_type);
 				break;
 
@@ -545,7 +797,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				/* multipart? recurse! */
 				g_object_unref (part);
 				g_free (content_type);
-				part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
+				part = modest_tny_msg_find_calendar_from_mime_part (part);
 				if (part)
 					break;
 			} else
@@ -564,14 +816,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	g_object_unref (G_OBJECT(iter));
 	g_object_unref (G_OBJECT(parts));
 
-	/* if were trying to find an HTML part and couldn't find it,
-	 * try to find a text/plain part instead
-	 */
-	if (!part && want_html) 
-		return modest_tny_msg_find_body_part_from_mime_part (msg, FALSE);
-	else
-		return part; /* this maybe NULL, this is not an error; some message just don't have a body
-			      * part */
+	return part; /* this maybe NULL, this is not an error; some message just don't have a body
+		      * part */
 }
 
 
@@ -584,6 +830,14 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 							     want_html);
 }
 
+TnyMimePart*
+modest_tny_msg_find_calendar (TnyMsg *msg)
+{
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
+	return modest_tny_msg_find_calendar_from_mime_part (TNY_MIME_PART(msg));
+}
+
 
 #define MODEST_TNY_MSG_PARENT_UID "parent-uid"
 
@@ -597,10 +851,11 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	gchar *old_subject;
 	gchar *new_subject;
 	TnyMimePart *body = NULL;
+	TnyMimePart *html_body = NULL;
 	ModestFormatter *formatter;
-	gchar *subject_prefix;
 	gboolean no_text_part;
 	gchar *parent_uid;
+	gboolean forward_as_attach = FALSE;
 
 	if (header)
 		g_object_ref (header);
@@ -609,8 +864,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 
 	/* Get body from original msg. Always look for the text/plain
 	   part of the message to create the reply/forwarded mail */
-	if (msg != NULL)
+	if (msg != NULL) {
 		body   = modest_tny_msg_find_body_part (msg, FALSE);
+		html_body = modest_tny_msg_find_body_part (msg, TRUE);
+	}
 
 	if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT,
 				  NULL))
@@ -624,14 +881,14 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 
 	/* when we're reply, include the text part if we have it, or nothing otherwise. */
 	if (is_reply)
-		new_msg = modest_formatter_quote  (formatter, no_text_part ? NULL: body, header,
+		new_msg = modest_formatter_quote  (formatter, body, header,
 						    attachments);
 	else {
-		/* for attachements; inline if there is a text part, and include the
-		 * full old mail if there was none */
-		if (no_text_part) {
+		if (no_text_part || (html_body && (strcmp (tny_mime_part_get_content_type (html_body), "text/html")==0))) {
+			forward_as_attach = TRUE;
 			new_msg = modest_formatter_attach (formatter, msg, header);
-		} else { 
+		} else {
+			forward_as_attach = FALSE;
 			new_msg = modest_formatter_inline  (formatter, body, header,
 							    attachments);
 		}
@@ -640,6 +897,8 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	g_object_unref (G_OBJECT(formatter));
 	if (body)
 		g_object_unref (G_OBJECT(body));
+	if (html_body)
+		g_object_unref (G_OBJECT(html_body));
 
 	/* Fill the header */
 	new_header = tny_msg_get_header (new_msg);
@@ -647,16 +906,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	tny_header_set_replyto (new_header, from);
 
 	/* Change the subject */
-	if (is_reply)
-		subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL);
-	else
-		subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL);
 	old_subject = tny_header_dup_subject (header);
 	new_subject =
-		(gchar *) modest_text_utils_derived_subject (old_subject,
-							     subject_prefix);
+		(gchar *) modest_text_utils_derived_subject (old_subject, is_reply);
 	g_free (old_subject);
-	g_free (subject_prefix);
 	tny_header_set_subject (new_header, (const gchar *) new_subject);
 	g_free (new_subject);
 
@@ -677,7 +930,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	g_object_unref (G_OBJECT (header));
 	/* ugly to unref it here instead of in the calling func */
 
-	if (!is_reply & !no_text_part) {
+	if (!is_reply & !forward_as_attach) {
 		add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL);
 	}
 
@@ -798,7 +1051,7 @@ add_if_attachment (gpointer data, gpointer user_data)
 	part = TNY_MIME_PART (data);
 	attachments_list = ((GList **) user_data);
 
-	if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) {
+	if (!tny_mime_part_is_purged (part) && ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))) {
 		*attachments_list = g_list_prepend (*attachments_list, part);
 		g_object_ref (part);
 	}
@@ -857,6 +1110,38 @@ count_addresses (const gchar* addresses)
 	return count;
 }
 
+static void
+remove_undisclosed_recipients (gchar **recipients)
+{
+	GSList *addresses, *node;
+	gboolean is_first;
+	GString *result;
+
+	g_return_if_fail (recipients);
+	addresses = modest_text_utils_split_addresses_list (*recipients);
+
+	is_first = TRUE;
+	result = g_string_new ("");
+	for (node = addresses; node != NULL; node = g_slist_next (node)) {
+		const gchar *address = (const gchar *) node->data;
+
+		if (address && strstr (address, "undisclosed-recipients"))
+			continue;
+
+		if (is_first)
+			is_first = FALSE;
+		else
+			result = g_string_append (result, ", ");
+
+		result = g_string_append (result, address);
+	}
+	g_slist_foreach (addresses, (GFunc)g_free, NULL);
+	g_slist_free (addresses);
+
+	g_free (*recipients);
+	*recipients = g_string_free (result, FALSE);
+}
+
 
 /* get the new To:, based on the old header,
  * result is newly allocated or NULL in case of error
@@ -865,9 +1150,12 @@ static gchar*
 get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	    ModestTnyMsgReplyMode reply_mode)
 {
+	const gchar *reply_header = "Reply-To:";
+	const gchar *from_header = "From:";
 	gchar* old_reply_to;
 	gchar* old_from;
 	gchar* new_to;
+	gchar* tmp;
 	
 	/* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we
 	 * can identify Mailing-List posts by the List-Help header.
@@ -884,13 +1172,25 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	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) {
-		g_warning ("%s: failed to get either Reply-To: or From: from header",
+		g_debug ("%s: failed to get either Reply-To: or From: from header",
 			   __FUNCTION__);
 		return NULL;
 	}
-	
+
+	/* Prevent DoS attacks caused by malformed emails */
+	if (old_from) {
+		gchar *tmp = old_from;
+		old_from = modest_text_utils_get_secure_header ((const gchar *) tmp, from_header);
+		g_free (tmp);
+	}
+	if (old_reply_to) {
+		gchar *tmp = old_reply_to;
+		old_reply_to = modest_text_utils_get_secure_header ((const gchar *) tmp, reply_header);
+		g_free (tmp);
+	}
+
 	/* for mailing lists, use both Reply-To and From if we did a
 	 * 'Reply All:'
 	 * */
@@ -907,7 +1207,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
 		gchar *old_to = tny_header_dup_to (header);
 		if (!old_to) 
-			g_warning ("%s: no To: address found in source mail",
+			g_debug ("%s: no To: address found in source mail",
 				   __FUNCTION__);
 		else {
 			/* append the old To: */
@@ -931,6 +1231,11 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 		}
 	}
 
+	tmp = modest_text_utils_simplify_recipients (new_to);
+	remove_undisclosed_recipients  (&tmp);
+	g_free (new_to);
+	new_to = tmp;
+
 	return new_to;
 }
 
@@ -938,7 +1243,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 /* get the new Cc:, based on the old header,
  * result is newly allocated or NULL in case of error */
 static gchar*
-get_new_cc (TnyHeader *header, const gchar* from)
+get_new_cc (TnyHeader *header, const gchar* from, const gchar *new_to)
 {
 	gchar *old_cc, *result, *dup;
 
@@ -948,8 +1253,27 @@ get_new_cc (TnyHeader *header, const gchar* from)
 
 	/* remove me (the new From:) from the Cc: list */
 	dup =  modest_text_utils_remove_address (old_cc, from);
+
+	if (new_to) {
+		gchar **to_parts, **current;
+
+		to_parts = g_strsplit (new_to, ",", 0);
+		for (current = to_parts; current && *current != '\0'; current++) {
+			gchar *dup2;
+
+			dup2 = modest_text_utils_remove_address (dup, g_strstrip (*current));
+			g_free (dup);
+			dup = dup2;
+		}
+		g_strfreev (to_parts);
+	}
+
 	result = modest_text_utils_remove_duplicate_addresses (dup);
 	g_free (dup);
+	dup = result;
+	result = modest_text_utils_simplify_recipients (dup);
+	remove_undisclosed_recipients  (&result);
+	g_free (dup);
 	g_free (old_cc);
 	return result;
 }
@@ -979,13 +1303,13 @@ modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **referenc
 
 		pair = TNY_PAIR (tny_iterator_get_current (iterator));
 		name = tny_pair_get_name (pair);
-		if (!g_strcasecmp (name, "References")) {
+		if (!g_ascii_strcasecmp (name, "References")) {
 			if (l_references) g_free (l_references);
 			l_references = g_strdup (tny_pair_get_value (pair));
-		} else if (!g_strcasecmp (name, "In-Reply-To")) {
+		} else if (!g_ascii_strcasecmp (name, "In-Reply-To")) {
 			if (l_in_reply_to) g_free (l_in_reply_to);
 			l_in_reply_to = g_strdup (tny_pair_get_value (pair));
-		} else if (!g_strcasecmp (name, "Message-ID")) {
+		} else if (!g_ascii_strcasecmp (name, "Message-ID")) {
 			if (l_message_id) g_free (l_message_id);
 			l_message_id = g_strdup (tny_pair_get_value (pair));
 		}
@@ -1016,6 +1340,14 @@ modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **referenc
 	}
 }
 
+static void
+remove_line_breaks (gchar *str)
+{
+	gchar *needle = g_strrstr (str, "\r\n");
+	if (needle)
+		*needle = '\0';
+}
+
 static void 
 set_references (TnyMsg *reply_msg, TnyMsg *original_msg)
 {
@@ -1050,14 +1382,18 @@ set_references (TnyMsg *reply_msg, TnyMsg *original_msg)
 	g_free (orig_message_id);
 
 	if (in_reply_to) {
+		remove_line_breaks (in_reply_to);
 		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "In-Reply-To", in_reply_to);
+		g_free (in_reply_to);
 	}
 	if (references) {
+		remove_line_breaks (references);
 		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "References", references);
+		g_free (references);
 	}
 }
 
-TnyMsg* 
+TnyMsg*
 modest_tny_msg_create_reply_msg (TnyMsg *msg,
 				 TnyHeader *header,
 				 const gchar *from,
@@ -1100,20 +1436,22 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 	new_header = tny_msg_get_header(new_msg);
 	new_to = get_new_to (msg, header, from, reply_mode);
 	if (!new_to)
-		g_warning ("%s: failed to get new To:", __FUNCTION__);
+		g_debug ("%s: failed to get new To:", __FUNCTION__);
 	else {
 		tny_header_set_to (new_header, new_to);
-		g_free (new_to);
 	}
 
 	if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
-		gchar *new_cc = get_new_cc (header, from);
+		gchar *new_cc = get_new_cc (header, from, new_to);
 		if (new_cc) { 
 			tny_header_set_cc (new_header, new_cc);
 			g_free (new_cc);
 		}
 	}
 
+	if (new_to)
+		g_free (new_to);
+
 	/* Clean */
 	g_object_unref (G_OBJECT (new_header));
 	g_object_unref (G_OBJECT (header));
@@ -1122,6 +1460,36 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 	return new_msg;
 }
 
+TnyMsg*
+modest_tny_msg_create_reply_calendar_msg (TnyMsg *msg,
+					  TnyHeader *header,
+					  const gchar *from,
+					  const gchar *signature,
+					  TnyList *headers)
+{
+	TnyMsg *new_msg = NULL;
+	TnyIterator *iterator;
+
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+
+	new_msg = modest_tny_msg_create_reply_msg (msg, header, from, signature,  
+						   MODEST_TNY_MSG_REPLY_TYPE_QUOTE, MODEST_TNY_MSG_REPLY_MODE_SENDER);
+
+	iterator = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyPair *pair = TNY_PAIR (tny_iterator_get_current (iterator));
+
+		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg),
+					       tny_pair_get_name (pair),
+					       tny_pair_get_value (pair));
+		g_object_unref (pair);
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+
+	return new_msg;
+}
+
 
 static gboolean
 is_ascii(const gchar *s)
@@ -1147,7 +1515,7 @@ get_content_type(const gchar *s)
 			g_string_append(type, "; charset=\"utf-8\"");
 		} else {
 			/* it should be impossible to reach this, but better safe than sorry */
-			g_warning("invalid utf8 in message");
+			g_debug("invalid utf8 in message");
 			g_string_append(type, "; charset=\"latin1\"");
 		}
 	}
@@ -1186,6 +1554,7 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header)
 {
 	GSList *recipients = NULL;
 	gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
+	gchar *after_remove, *joined;
 
 	if (header == NULL)
 		return NULL;
@@ -1195,20 +1564,21 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header)
 	cc = tny_header_dup_cc (header);
 	bcc = tny_header_dup_bcc (header);
 
-	recipients = NULL;
+	joined = modest_text_utils_join_addresses (from, to, cc, bcc);
+	after_remove = modest_text_utils_remove_duplicate_addresses (joined);
+	g_free (joined);
+
+	recipients = modest_text_utils_split_addresses_list (after_remove);
+	g_free (after_remove);
+
 	if (from)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (from));
+		g_free (from);
 	if (to)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (to));
+		g_free (to);
 	if (cc)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (cc));
+		g_free (cc);
 	if (bcc)
-		recipients = g_slist_concat (recipients, modest_text_utils_split_addresses_list (bcc));
-
-	g_free (from);
-	g_free (to);
-	g_free (cc);
-	g_free (bcc);
+		g_free (bcc);
 
 	return recipients;
 }