X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=78b4b75ccd64006b95578ff443cfa51947c9b1ec;hp=627839991b8cb072f7e95e0ca14168f3ed65a3f8;hb=4d39841513a3a7f7aa9d38ab97cb9fcc9171e80b;hpb=ac50c4b59461225aa321ffadaa27be00a6402be3

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 6278399..78b4b75 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -33,12 +33,15 @@
 #include <tny-simple-list.h>
 #include <tny-folder.h>
 #include <modest-runtime.h>
+#include <modest-defs.h>
 #include "modest-formatter.h"
-#include <tny-camel-stream.h>
+#include <tny-camel-mem-stream.h>
 #include <tny-camel-mime-part.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-mem.h>
 #include <glib/gprintf.h>
+#include <modest-tny-folder.h>
+#include "modest-tny-mime-part.h"
+#include <modest-error.h>
+
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -50,48 +53,72 @@
 static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
 				    const gchar *content_type);
 static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
-static void add_attachments (TnyMsg *msg, GList *attachments_list);
+static gint add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err);
+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);
 
 
 TnyMsg*
 modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
-		    const gchar *bcc, const gchar* subject, const gchar *body,
-		    GList *attachments)
+		    const gchar *bcc, const gchar* subject,
+		    const gchar *references, const gchar *in_reply_to,
+		    const gchar *body,
+		    GList *attachments, gint *attached, 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));
+	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
 	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);
 	}
-	if ((mailto != NULL) && (strlen(mailto) > 0)) 
-		tny_header_set_to (TNY_HEADER (header), mailto);
-	if ((cc != NULL) && (strlen(cc) > 0)) 
+	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)) 
+	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);
-		
+
+	/* set modest as the X-Mailer
+	 * we could this in the platform factory, but then the header
+	 * would show up before all the others.
+	 */
+	tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest "
+				       VERSION);
+
+	if (references)
+		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "References", references);
+
+	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)
-		add_attachments (new_msg, attachments);
+		tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+	if (attached)
+		*attached = tmp_attached;
+	if (header)
+		g_object_unref(header);
 
 	return new_msg;
 }
@@ -99,15 +126,17 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 TnyMsg*
 modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc,
 			       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 *attachments, GList *images, gint *attached, GError **err)
 {
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
+	gint tmp_attached;
 	
 	/* Create new msg */
-	new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL));
+	new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL));
 	header  = tny_msg_get_header (new_msg);
 	
 	if ((from != NULL) && (strlen(from) > 0)) {
@@ -125,14 +154,32 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 		tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(plain_body);
-		
+	
+	/* set modest as the X-Mailer
+	 * we could this in the platform factory, but then the header
+	 * would show up before all the others.
+	 */
+	tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "X-Mailer", "Modest "
+				       VERSION);
+
+	if (references)
+		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "References", references);
+
+	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_body_part (new_msg, plain_body, content_type);
 	add_html_body_part (new_msg, html_body);
 	g_free (content_type);
 		       
 	/* Add attachments */
-	add_attachments (new_msg, attachments);
+	tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+	if (attached)
+		*attached = tmp_attached;
+	add_images (new_msg, images, err);
+	if (header)
+		g_object_unref(header);
 
 	return new_msg;
 }
@@ -148,17 +195,16 @@ add_body_part (TnyMsg *msg,
 	TnyStream *text_body_stream;
 
 	/* Create the stream */
-	text_body_stream = TNY_STREAM (tny_camel_stream_new
-				       (camel_stream_mem_new_with_buffer
-					(body, (body ? strlen(body) : 0))));
+	text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+					(body, (body ? strlen(body) : 0)));
 
 	text_body_part = modest_formatter_create_body_part (NULL, msg);
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
-	tny_mime_part_construct_from_stream (text_body_part,
-					     text_body_stream,
-					     content_type);
+	tny_mime_part_construct (text_body_part,
+				 text_body_stream,
+				 content_type, "7bit");
 	tny_stream_reset (text_body_stream);
 
 	g_object_unref (G_OBJECT(text_body_part));
@@ -177,18 +223,19 @@ add_html_body_part (TnyMsg *msg,
 	TnyStream *html_body_stream;
 
 	/* Create the stream */
-	html_body_stream = TNY_STREAM (tny_camel_stream_new
-				       (camel_stream_mem_new_with_buffer
-					(body, strlen(body))));
+	html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+					(body, strlen(body)));
 
 	/* Create body part if needed */
 	html_body_part = modest_formatter_create_body_part (NULL, msg);
 
 	/* Construct MIME part */
 	tny_stream_reset (html_body_stream);
-	tny_mime_part_construct_from_stream (html_body_part,
-					     html_body_stream,
-					     "text/html; charset=utf-8");
+	tny_mime_part_construct (html_body_part,
+			         html_body_stream,
+			         "text/html; charset=utf-8", 
+			         "7bit"); /* Sometimes it might be needed 
+					     to make this one a 8bit! */
 	tny_stream_reset (html_body_stream);
 
 	g_object_unref (G_OBJECT(html_body_part));
@@ -200,7 +247,7 @@ add_html_body_part (TnyMsg *msg,
 }
 
 static TnyMimePart *
-copy_mime_part (TnyMimePart *part)
+copy_mime_part (TnyMimePart *part, GError **err)
 {
 	TnyMimePart *result = NULL;
 	const gchar *attachment_content_type;
@@ -209,7 +256,9 @@ copy_mime_part (TnyMimePart *part)
 	TnyList *parts;
 	TnyIterator *iterator;
 	TnyStream *attachment_stream;
-
+	const gchar *enc;
+	gint ret;
+	
 	if (TNY_IS_MSG (part)) {
 		g_object_ref (part);
 		return part;
@@ -225,12 +274,21 @@ copy_mime_part (TnyMimePart *part)
 	attachment_cid = tny_mime_part_get_content_id (part);
 	
 	/* fill the stream */
- 	attachment_stream = tny_mime_part_get_stream (part);
-	tny_stream_reset (attachment_stream);
-	tny_mime_part_construct_from_stream (result,
-					     attachment_stream,
-					     attachment_content_type);
-	tny_stream_reset (attachment_stream);
+ 	attachment_stream = tny_mime_part_get_decoded_stream (part);
+	enc = tny_mime_part_get_transfer_encoding (part);
+	if (attachment_stream == NULL) {
+		if (err != NULL && *err == NULL)
+			g_set_error (err, MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FILE_IO, _("TODO: couldn't retrieve attachment"));
+		g_object_unref (result);
+		return NULL;
+	} else {
+		ret = tny_stream_reset (attachment_stream);
+		ret = tny_mime_part_construct (result,
+					       attachment_stream,
+					       attachment_content_type, 
+					       enc);
+		ret = tny_stream_reset (attachment_stream);
+	}
 	
 	/* set other mime part fields */
 	tny_mime_part_set_filename (result, attachment_filename);
@@ -243,8 +301,15 @@ copy_mime_part (TnyMimePart *part)
 	while (!tny_iterator_is_done (iterator)) {
 		TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator));
 		if (subpart) {
-			TnyMimePart *subpart_copy = copy_mime_part (subpart);
-			tny_mime_part_add_part (result, subpart_copy);
+			const gchar *subpart_cid;
+			TnyMimePart *subpart_copy = copy_mime_part (subpart, err);
+			if (subpart_copy != NULL) {
+				subpart_cid = tny_mime_part_get_content_id (subpart);
+				tny_mime_part_add_part (result, subpart_copy);
+				if (subpart_cid)
+					tny_mime_part_set_content_id (result, subpart_cid);
+				g_object_unref (subpart_copy);
+			}
 			g_object_unref (subpart);
 		}
 
@@ -257,18 +322,82 @@ copy_mime_part (TnyMimePart *part)
 	return result;
 }
 
-static void
-add_attachments (TnyMsg *msg, GList *attachments_list)
+static gint
+add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err)
 {
 	GList *pos;
 	TnyMimePart *attachment_part, *old_attachment;
+	gint ret;
+	gint attached = 0;
 
 	for (pos = (GList *)attachments_list; pos; pos = pos->next) {
 
 		old_attachment = pos->data;
-		attachment_part = copy_mime_part (old_attachment);
-		tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
-		g_object_unref (attachment_part);
+		if (!tny_mime_part_is_purged (old_attachment)) {
+			const gchar *old_cid;
+			old_cid = tny_mime_part_get_content_id (old_attachment);
+			attachment_part = copy_mime_part (old_attachment, err);
+			if (attachment_part != NULL) {
+				if (add_inline) {
+					tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
+								       "inline");
+				} else {
+					const gchar *filename;
+					filename = tny_mime_part_get_filename (old_attachment);
+					if (filename)
+						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");
+				}
+				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);
+			}
+		}
+	}
+	return attached;
+}
+
+static void
+add_images (TnyMsg *msg, GList *images_list, GError **err)
+{
+	TnyMimePart *related_part = NULL;
+	const gchar *content_type;
+
+	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+
+	if ((content_type != NULL) && !strcasecmp (content_type, "multipart/related")) {
+		related_part = g_object_ref (msg);
+	} else if ((content_type != NULL) && !strcasecmp (content_type, "multipart/mixed")) {
+		TnyList *parts = TNY_LIST (tny_simple_list_new ());
+		TnyIterator *iter = NULL;
+		tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+		iter = tny_list_create_iterator (parts);
+
+		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")) {
+				related_part = part;
+				break;
+			}
+			if (part)
+				g_object_unref (part);
+			tny_iterator_next (iter);
+		}
+		g_object_unref (iter);
+		g_object_unref (parts);
+	}
+
+	if (related_part != NULL) {
+		/* TODO: attach images in their proper place */
+		add_attachments (related_part, images_list, TRUE, err);
+		g_object_unref (related_part);
 	}
 }
 
@@ -283,6 +412,8 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 	gchar *to_quote;
 	gboolean result_was_html = TRUE;
 
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
 	body = modest_tny_msg_find_body_part(msg, want_html);
 	if (!body)
 		return NULL;
@@ -290,7 +421,7 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 	buf = gtk_text_buffer_new (NULL);
 	stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
 	tny_stream_reset (stream);
-	tny_mime_part_decode_to_stream (body, stream);
+	tny_mime_part_decode_to_stream (body, stream, NULL);
 	tny_stream_reset (stream);
 	
 	gtk_text_buffer_get_bounds (buf, &start, &end);
@@ -313,17 +444,88 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 }
 
 
+static TnyMimePart*
+modest_tny_msg_find_body_part_in_alternative (TnyMimePart *msg, gboolean want_html)
+{
+	TnyList *parts;
+	TnyIterator *iter;
+	TnyMimePart *part = 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;
+
+		g_object_unref (part);
+		part = NULL;
+
+	}
+	g_object_unref (iter);
+	g_object_unref (parts);
+
+	if (part == NULL) {
+		return first_part;
+	} else {
+		if (first_part) g_object_unref (first_part);
+		return part;
+	}
+}
+
 TnyMimePart*
 modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
 {
-	const gchar *mime_type = want_html ? "text/html" : "text/plain";
 	TnyMimePart *part = NULL;
 	TnyList *parts = NULL;
 	TnyIterator *iter = NULL;
-
+	gchar *header_content_type;
+	gchar *header_content_type_lower = NULL;
+	
 	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);
+	}	
+	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);
 
@@ -331,127 +533,179 @@ 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;
 		g_object_unref (G_OBJECT(iter));
-		return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+		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/");
+		g_free (content_type);
+		/* if this part cannot be a supported body return NULL */
+		if (!is_text_part) {
+			return NULL;
+		} else {
+			return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+		}
 	} else {
-		gchar *content_type = 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...
 			 */
-			if (part) {
-				content_type = g_ascii_strdown
-					(tny_mime_part_get_content_type (part), -1);
+			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, mime_type) &&
-			    !tny_mime_part_is_attachment (part))
-				break;
 			
-			if (g_str_has_prefix(content_type, "multipart")) {
-				part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
+			if (g_str_has_prefix (content_type, "text/") && 
+			    !has_content_disp_name &&
+			    !modest_tny_mime_part_is_attachment_for_modest (part)) {
+				/* 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;
+
+			} 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;
-			}
 
-			if (part)
-				g_object_unref (G_OBJECT(part));
+			} else 	if (g_str_has_prefix(content_type, "multipart")) {
 
-			part = NULL;
+				/* 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;
+			}
 			
-			g_free (content_type);
-			content_type = NULL;
-
 			tny_iterator_next (iter);
 			
 		} while (!tny_iterator_is_done(iter));
-		g_free (content_type);
 	}
 	
 	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 */
 }
 
 
 TnyMimePart*
 modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 {
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
 	return modest_tny_msg_find_body_part_from_mime_part (TNY_MIME_PART(msg),
 							     want_html);
 }
 
 
+#define MODEST_TNY_MSG_PARENT_UID "parent-uid"
+
 static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, const gchar *signature, 
-			   gboolean is_reply, guint type, GList *attachments)
+create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
+			   const gchar *signature, gboolean is_reply,
+			   guint type /*ignored*/, GList *attachments)
 {
 	TnyMsg *new_msg;
 	TnyHeader *new_header;
+	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;
 
-	/* Get body from original msg. Always look for the text/plain
-	   part of the message to create the reply/forwarded mail */
 	if (header)
 		g_object_ref (header);
 	else
 		header = tny_msg_get_header (msg);
 
-	if (msg != NULL)
+	/* Get body from original msg. Always look for the text/plain
+	   part of the message to create the reply/forwarded mail */
+	if (msg != NULL) {
 		body   = modest_tny_msg_find_body_part (msg, FALSE);
+		html_body = modest_tny_msg_find_body_part (msg, TRUE);
+	}
 
-	/* TODO: select the formatter from account prefs */
-	if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
+	if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT,
+				  NULL))
 		formatter = modest_formatter_new ("text/html", signature);
 	else
 		formatter = modest_formatter_new ("text/plain", signature);
 
-	/* Format message body */
-	if (is_reply) {
-		switch (type) {
-		case MODEST_TNY_MSG_REPLY_TYPE_CITE:
-		default:
-			new_msg = modest_formatter_cite  (formatter, body, header);
-			break;
-		case MODEST_TNY_MSG_REPLY_TYPE_QUOTE:
-			new_msg = modest_formatter_quote (formatter, body, header, attachments);
-			break;
-		}
-	} else {
-		switch (type) {
-		case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
-		default:
-			new_msg = modest_formatter_inline  (formatter, body, header, attachments);
-			break;
-		case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
-			new_msg = modest_formatter_attach (formatter, body, header);
-			break;
+
+	/* if we don't have a text-part */
+	no_text_part = (!body) || (strcmp (tny_mime_part_get_content_type (body), "text/html")==0);
+
+	/* when we're reply, include the text part if we have it, or nothing otherwise. */
+	if (is_reply)
+		new_msg = modest_formatter_quote  (formatter, body, header,
+						    attachments);
+	else {
+		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 {
+			forward_as_attach = FALSE;
+			new_msg = modest_formatter_inline  (formatter, body, header,
+							    attachments);
 		}
 	}
+
 	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);	
+	new_header = tny_msg_get_header (new_msg);
 	tny_header_set_from (new_header, from);
 	tny_header_set_replyto (new_header, from);
 
@@ -460,20 +714,144 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, co
 		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 (tny_header_get_subject(header),
+		(gchar *) modest_text_utils_derived_subject (old_subject,
 							     subject_prefix);
+	g_free (old_subject);
 	g_free (subject_prefix);
 	tny_header_set_subject (new_header, (const gchar *) new_subject);
 	g_free (new_subject);
 
+	/* get the parent uid, and set it as a gobject property on the new msg */
+	parent_uid = modest_tny_folder_get_header_unique_id (header);
+	g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID,
+				parent_uid, g_free);
+
+	/* set modest as the X-Mailer
+	 * we could this in the platform factory, but then the header
+	 * would show up before all the others.
+	 */
+	tny_mime_part_set_header_pair (TNY_MIME_PART (msg), "X-Mailer", "Modest "
+				       VERSION);
+
 	/* Clean */
 	g_object_unref (G_OBJECT (new_header));
 	g_object_unref (G_OBJECT (header));
+	/* ugly to unref it here instead of in the calling func */
+
+	if (!is_reply & !forward_as_attach) {
+		add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL);
+	}
 
 	return new_msg;
 }
 
+const gchar*
+modest_tny_msg_get_parent_uid (TnyMsg *msg)
+{
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
+	return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID);
+}
+
+static gchar *get_signed_protocol (TnyMimePart *part)
+{
+	TnyList *header_pairs;
+	TnyIterator *iterator;
+	gchar *result = NULL;
+
+	header_pairs = TNY_LIST (tny_simple_list_new ());
+	tny_mime_part_get_header_pairs (part, header_pairs);
+	iterator = tny_list_create_iterator (header_pairs);
+
+	while (!result && !tny_iterator_is_done (iterator)) {
+		TnyPair *pair;
+		const gchar *name;
+
+		pair = TNY_PAIR (tny_iterator_get_current (iterator));
+		name = tny_pair_get_name (pair);
+		if (name && !g_ascii_strcasecmp (name, "Content-Type")) {
+			const gchar *s;
+			s = tny_pair_get_value (pair);
+			if (s) {
+				s = strstr (s, "protocol=");
+				if (s) {
+					const gchar *t;
+					s += 9;
+					if (*s == '\"') {
+						s++;
+						t = strstr (s, "\"");
+					} else {
+						t = strstr (s, ";");
+					}
+					result = g_strndup (s, t - s);
+				}
+			}
+		}
+
+		g_object_unref (pair);
+		tny_iterator_next (iterator);
+	}
+
+	g_object_unref (iterator);
+	g_object_unref (header_pairs);
+
+	return result;
+}
+
+TnyMimePart *
+modest_tny_msg_get_attachments_parent (TnyMsg *msg)
+{
+	TnyMimePart *result;
+	const gchar *content_type;
+
+	result = NULL;
+
+	content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+	if (content_type && !strcmp (content_type, "multipart/signed")) {
+		TnyList *msg_children;
+		TnyIterator *iterator;
+		gchar *signed_protocol;
+
+		msg_children = TNY_LIST (tny_simple_list_new ());
+		tny_mime_part_get_parts (TNY_MIME_PART (msg), msg_children);
+
+		iterator = tny_list_create_iterator (msg_children);
+		signed_protocol = get_signed_protocol (TNY_MIME_PART (msg));
+			
+		while (!result && !tny_iterator_is_done (iterator)) {
+			TnyMimePart *part;
+
+			part = TNY_MIME_PART (tny_iterator_get_current (iterator));
+			if (signed_protocol) {
+				const gchar *part_content_type;
+
+				part_content_type = tny_mime_part_get_content_type (part);
+				if (part_content_type && g_ascii_strcasecmp (part_content_type, signed_protocol)) {
+					result = g_object_ref (part);
+				}
+			} else {
+				result = g_object_ref (part);
+			}
+
+			g_object_unref (part);
+			tny_iterator_next (iterator);
+		}
+
+		g_object_unref (iterator);
+		g_free (signed_protocol);
+		g_object_unref (msg_children);
+	}
+	if (result == NULL) {
+		result = g_object_ref (msg);
+	}
+
+	return result;
+}
+
+
+
 static void
 add_if_attachment (gpointer data, gpointer user_data)
 {
@@ -498,23 +876,255 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
 	TnyMsg *new_msg;
 	TnyList *parts = NULL;
 	GList *attachments_list = NULL;
+	TnyMimePart *part_to_check = NULL;
 
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+
+	part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg));
+	
 	/* Add attachments */
 	parts = TNY_LIST (tny_simple_list_new());
-	tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+	tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts);
 	tny_list_foreach (parts, add_if_attachment, &attachments_list);
 
-	new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, attachments_list);
-	add_attachments (new_msg, attachments_list);
+	new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
+					     attachments_list);
 
 	/* Clean */
-	if (attachments_list)
+	if (attachments_list) {
+		g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
 		g_list_free (attachments_list);
+	}
 	g_object_unref (G_OBJECT (parts));
+	g_object_unref (part_to_check);
 
 	return new_msg;
 }
 
+
+
+static gint
+count_addresses (const gchar* addresses)
+{
+	gint count = 1;
+
+	if (!addresses)
+		return 0;
+	
+	while (*addresses) {
+		if (*addresses == ',' || *addresses == ';')
+			++count;
+		++addresses;
+	}
+	
+	return count;
+}
+
+
+/* get the new To:, based on the old header,
+ * result is newly allocated or NULL in case of error
+ * */
+static gchar*
+get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
+	    ModestTnyMsgReplyMode reply_mode)
+{
+	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.
+	 * for mailing lists, both the Reply-To: and From: should be included
+	 * in the new To:; for now, we're ignoring List-Post
+	 */
+	gchar* list_help = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), 
+								  "List-Help");
+	gboolean is_mailing_list = (list_help != NULL);
+	g_free (list_help);
+
+
+	/* reply to sender, use ReplyTo or 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_debug ("%s: failed to get either Reply-To: or From: from header",
+			   __FUNCTION__);
+		return NULL;
+	}
+	
+	/* for mailing lists, use both Reply-To and From if we did a
+	 * 'Reply All:'
+	 * */
+	if (is_mailing_list && reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL &&
+	    old_reply_to && old_from && strcmp (old_from, old_reply_to) != 0)
+		new_to = g_strjoin (",", old_reply_to, old_from, NULL);
+	else
+		/* 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) {
+		gchar *old_to = tny_header_dup_to (header);
+		if (!old_to) 
+			g_debug ("%s: no To: address found in source mail",
+				   __FUNCTION__);
+		else {
+			/* append the old To: */
+			gchar *tmp = g_strjoin (",", new_to, old_to, NULL);
+			g_free (new_to);
+			new_to = tmp;
+			g_free (old_to);
+		}
+
+		/* remove duplicate entries */
+		gchar *tmp = modest_text_utils_remove_duplicate_addresses (new_to);
+		g_free (new_to);
+		new_to = tmp;
+		
+		/* now, strip me (the new From:) from the new_to, but only if
+		 * there are >1 addresses there */
+		if (count_addresses (new_to) > 1) {
+			gchar *tmp = modest_text_utils_remove_address (new_to, from);
+			g_free (new_to);
+			new_to = tmp;
+		}
+	}
+
+	tmp = modest_text_utils_simplify_recipients (new_to);
+	g_free (new_to);
+	new_to = tmp;
+
+	return new_to;
+}
+
+
+/* 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)
+{
+	gchar *old_cc, *result, *dup;
+
+	old_cc = tny_header_dup_cc (header);
+	if (!old_cc)
+		return NULL;
+
+	/* remove me (the new From:) from the Cc: list */
+	dup =  modest_text_utils_remove_address (old_cc, from);
+	result = modest_text_utils_remove_duplicate_addresses (dup);
+	g_free (dup);
+	g_free (old_cc);
+	return result;
+}
+
+void 
+modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **references, gchar **in_reply_to)
+{
+	TnyList *headers;
+	TnyIterator *iterator;
+	gchar *l_message_id;
+	gchar *l_references;
+	gchar *l_in_reply_to;
+
+	g_return_if_fail (TNY_IS_MSG (msg));
+
+	l_message_id = NULL;
+	l_references = NULL;
+	l_in_reply_to = NULL;
+
+	headers = TNY_LIST (tny_simple_list_new ());
+	tny_mime_part_get_header_pairs (TNY_MIME_PART (msg), headers);
+
+	iterator = tny_list_create_iterator (headers);
+	while (!tny_iterator_is_done (iterator)) {
+		TnyPair *pair;
+		const gchar *name;
+
+		pair = TNY_PAIR (tny_iterator_get_current (iterator));
+		name = tny_pair_get_name (pair);
+		if (!g_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")) {
+			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")) {
+			if (l_message_id) g_free (l_message_id);
+			l_message_id = g_strdup (tny_pair_get_value (pair));
+		}
+
+		g_object_unref (pair);
+		tny_iterator_next (iterator);
+	}
+
+	g_object_unref (iterator);
+	g_object_unref (headers);
+
+	if (message_id) {
+		*message_id = l_message_id;
+	} else {
+		g_free (l_message_id);
+	}
+
+	if (in_reply_to) {
+		*in_reply_to = l_in_reply_to;
+	} else {
+		g_free (l_in_reply_to);
+	}
+
+	if (references) {
+		*references = l_references;
+	} else {
+		g_free (l_references);
+	}
+}
+
+static void 
+set_references (TnyMsg *reply_msg, TnyMsg *original_msg)
+{
+	gchar *orig_references, *orig_in_reply_to, *orig_message_id;
+	gchar *references, *in_reply_to;
+
+	modest_tny_msg_get_references (original_msg, &orig_message_id, &orig_references, &orig_in_reply_to);
+
+	references = NULL;
+	in_reply_to = NULL;
+
+	if (orig_message_id)
+		in_reply_to = g_strdup (orig_message_id);
+
+	if (orig_references) {
+		if (orig_message_id)
+			references = g_strconcat (orig_references, "\n        ", orig_message_id, NULL);
+		else
+			references = g_strdup (orig_references);
+
+	} else if (orig_in_reply_to) {
+		if (orig_message_id)
+			references = g_strconcat (orig_in_reply_to, "\n        ", orig_message_id, NULL);
+		else
+			references = g_strdup (orig_in_reply_to);
+	} else if (orig_message_id) {
+		references = g_strdup (orig_message_id);
+	}
+
+	g_free (orig_references);
+	g_free (orig_in_reply_to);
+	g_free (orig_message_id);
+
+	if (in_reply_to) {
+		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "In-Reply-To", in_reply_to);
+	}
+	if (references) {
+		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "References", references);
+	}
+}
+
 TnyMsg* 
 modest_tny_msg_create_reply_msg (TnyMsg *msg,
 				 TnyHeader *header,
@@ -525,75 +1135,57 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
 {
 	TnyMsg *new_msg = NULL;
 	TnyHeader *new_header;
-	const gchar* reply_to;
-	gchar *new_cc = NULL;
-	const gchar *cc = NULL, *bcc = NULL;
-	GString *tmp = NULL;
+	gchar *new_to = NULL;
 	TnyList *parts = NULL;
 	GList *attachments_list = NULL;
+	TnyMimePart *part_to_check = NULL;
 
-	/* Add attachments */
-	if (msg != NULL) {
-		parts = TNY_LIST (tny_simple_list_new());
-		tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
-		tny_list_foreach (parts, add_if_attachment, &attachments_list);
-	}
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
 
-	new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type, attachments_list);
-	if (attachments_list) {
+	part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg));
+
+	parts = TNY_LIST (tny_simple_list_new());
+	tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts);
+	tny_list_foreach (parts, add_if_attachment, &attachments_list);
+
+	new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
+					     attachments_list);
+
+	set_references (new_msg, msg);
+	if (attachments_list != NULL) {
 		g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
 		g_list_free (attachments_list);
 	}
-	if (parts)
-		g_object_unref (G_OBJECT (parts));
+	g_object_unref (parts);
 
 	/* Fill the header */
 	if (header)
 		g_object_ref (header);
 	else
 		header = tny_msg_get_header (msg);
-	new_header = tny_msg_get_header (new_msg);
-	reply_to = tny_header_get_replyto (header);
 
-	if (reply_to)
-		tny_header_set_to (new_header, reply_to);
-	else
-		tny_header_set_to (new_header, tny_header_get_from (header));
-
-	switch (reply_mode) {
-	case MODEST_TNY_MSG_REPLY_MODE_SENDER:
-		/* Do not fill neither cc nor bcc */
-		break;
-	case MODEST_TNY_MSG_REPLY_MODE_LIST:
-		/* TODO */
-		break;
-	case MODEST_TNY_MSG_REPLY_MODE_ALL:
-		/* Concatenate to, cc and bcc */
-		cc = tny_header_get_cc (header);
-		bcc = tny_header_get_bcc (header);
-
-		tmp = g_string_new (tny_header_get_to (header));
-		if (cc)  g_string_append_printf (tmp, ",%s",cc);
-		if (bcc) g_string_append_printf (tmp, ",%s",bcc);
-
-               /* Remove my own address from the cc list. TODO:
-                  remove also the To: of the new message, needed due
-                  to the new reply_to feature */
-		new_cc = (gchar *)
-			modest_text_utils_remove_address ((const gchar *) tmp->str,
-							  from);
-		/* FIXME: remove also the mails from the new To: */
-		tny_header_set_cc (new_header, new_cc);
-
-		/* Clean */
-		g_string_free (tmp, TRUE);
-		g_free (new_cc);
-		break;
+	
+	new_header = tny_msg_get_header(new_msg);
+	new_to = get_new_to (msg, header, from, reply_mode);
+	if (!new_to)
+		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);
+		if (new_cc) { 
+			tny_header_set_cc (new_header, new_cc);
+			g_free (new_cc);
+		}
 	}
 
 	/* Clean */
 	g_object_unref (G_OBJECT (new_header));
 	g_object_unref (G_OBJECT (header));
+	g_object_unref (G_OBJECT (part_to_check));
 
 	return new_msg;
 }
@@ -623,9 +1215,114 @@ 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\"");
 		}
 	}
 	return g_string_free(type, FALSE);
 }
+
+guint64
+modest_tny_msg_estimate_size (const gchar *plain_body, const gchar *html_body,
+			      guint64 parts_count,
+			      guint64 parts_size)
+{
+	guint64 result;
+
+	/* estimation of headers size */
+	result = 1024;
+
+	/* We add a 20% of size due to the increase in 7bit encoding */
+	if (plain_body) {
+		result += strlen (plain_body) * 120 / 100;
+	}
+	if (html_body) {
+		result += strlen (html_body) * 120 / 100;
+	}
+
+	/* 256 bytes per additional part because of their headers */
+	result += parts_count * 256;
+
+	/* 150% of increase per encoding */
+	result += parts_size * 3 / 2;
+
+	return result;
+}
+
+GSList *
+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;
+	GString *buffer;
+	gboolean add_separator = TRUE;
+
+	if (header == NULL)
+		return NULL;
+
+	buffer = g_string_new ("");
+
+	from = tny_header_dup_from (header);
+	to = tny_header_dup_to (header);
+	cc = tny_header_dup_cc (header);
+	bcc = tny_header_dup_bcc (header);
+
+	recipients = NULL;
+	if (from) {
+		buffer = g_string_append (buffer, from);
+		add_separator = TRUE;
+	}
+	if (to) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, to);
+	}
+	if (cc) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, cc);
+	}
+	if (bcc) {
+		if (add_separator)
+			buffer = g_string_append (buffer, "; ");
+		else
+			add_separator = TRUE;
+
+		buffer = g_string_append (buffer, bcc);
+	}
+
+	after_remove = modest_text_utils_remove_duplicate_addresses (buffer->str);
+	g_string_free (buffer, TRUE);
+
+	recipients = modest_text_utils_split_addresses_list (after_remove);
+	g_free (after_remove);
+
+	return recipients;
+}
+
+GSList *
+modest_tny_msg_get_all_recipients_list (TnyMsg *msg)
+{
+	TnyHeader *header = NULL;
+	GSList *recipients = NULL;
+
+	if (msg == NULL)
+		return NULL;
+
+	header = tny_msg_get_header (msg);
+	if (header == NULL)
+		return NULL;
+
+	recipients = modest_tny_msg_header_get_all_recipients_list (header);
+	g_object_unref (header);
+
+	return recipients;
+}
+