X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=3cec8ad94e1809672d78629bb36bc7cd4db15768;hp=6a4f8273bfa8ddd4823e1ebf9fd2114538d0fd1b;hb=b3e33b42465084b4e1cf2dbf90302bd1b43d05ad;hpb=c2c60d8c88aa180b656a1b932ea695185f7f3f6e

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 6a4f827..3cec8ad 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -35,7 +35,11 @@
 #include <modest-runtime.h>
 #include "modest-formatter.h"
 #include <tny-camel-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>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -45,40 +49,93 @@
 #include "modest-text-utils.h"
 
 static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
-				    const gchar *content_type, gboolean has_attachments);
-static void add_attachments (TnyMsg *msg, GList *attachments_list);
+				    const gchar *content_type);
+static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
+static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline);
+static void add_images (TnyMsg *msg, GList *attachments_list);
 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,
-		    GSList *attachments)
+		    GList *attachments)
 {
-	TnyPlatformFactory *fact;
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
 	
 	/* Create new msg */
-	fact    = modest_runtime_get_platform_factory ();
-	new_msg = tny_platform_factory_new_msg (fact);
+	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
 	header  = tny_msg_get_header (new_msg);
 	
-	tny_header_set_from (TNY_HEADER (header), from);
-	tny_header_set_replyto (TNY_HEADER (header), from);
-	tny_header_set_to (TNY_HEADER (header), mailto);
-	tny_header_set_cc (TNY_HEADER (header), cc);
-	tny_header_set_bcc (TNY_HEADER (header), bcc);
-	tny_header_set_subject (TNY_HEADER (header), subject);
+	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)) 
+		tny_header_set_cc (TNY_HEADER (header), cc);
+	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+		tny_header_set_bcc (TNY_HEADER (header), bcc);
+	
+	if ((subject != NULL) && (strlen(subject) > 0)) 
+		tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(body);
 		
+	/* 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 (TNY_MIME_PART (new_msg), attachments, FALSE);
+
+	return new_msg;
+}
+
+TnyMsg*
+modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc,
+			       const gchar *bcc, const gchar* subject, 
+			       const gchar *html_body, const gchar *plain_body,
+			       GList *attachments, GList *images)
+{
+	TnyMsg *new_msg;
+	TnyHeader *header;
+	gchar *content_type;
+	
+	/* Create new msg */
+	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)) {
+		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)) 
+		tny_header_set_cc (TNY_HEADER (header), cc);
+	if ((bcc != NULL) && (strlen(bcc) > 0)) 
+		tny_header_set_bcc (TNY_HEADER (header), bcc);
+	
+	if ((subject != NULL) && (strlen(subject) > 0)) 
+		tny_header_set_subject (TNY_HEADER (header), subject);
+
+	content_type = get_content_type(plain_body);
+		
 	/* Add the body of the new mail */	
-	add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE));
+	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, (GList*) attachments);
+	add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+	add_images (new_msg, images);
 
 	return new_msg;
 }
@@ -88,8 +145,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 static TnyMimePart *
 add_body_part (TnyMsg *msg, 
 	       const gchar *body,
-	       const gchar *content_type,
-	       gboolean has_attachments)
+	       const gchar *content_type)
 {
 	TnyMimePart *text_body_part = NULL;
 	TnyStream *text_body_stream;
@@ -97,14 +153,9 @@ add_body_part (TnyMsg *msg,
 	/* Create the stream */
 	text_body_stream = TNY_STREAM (tny_camel_stream_new
 				       (camel_stream_mem_new_with_buffer
-					(body, strlen(body))));
+					(body, (body ? strlen(body) : 0))));
 
-	/* Create body part if needed */
-	if (has_attachments)
-		text_body_part = tny_platform_factory_new_mime_part
-			(modest_runtime_get_platform_factory ());
-	else
-		text_body_part = TNY_MIME_PART(msg);
+	text_body_part = modest_formatter_create_body_part (NULL, msg);
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
@@ -113,11 +164,7 @@ add_body_part (TnyMsg *msg,
 					     content_type);
 	tny_stream_reset (text_body_stream);
 
-	/* Add part if needed */
-	if (has_attachments) {
-		tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
-		g_object_unref (G_OBJECT(text_body_part));
-	}
+	g_object_unref (G_OBJECT(text_body_part));
 
 	/* Clean */
 	g_object_unref (text_body_stream);
@@ -125,46 +172,159 @@ add_body_part (TnyMsg *msg,
 	return text_body_part;
 }
 
-static void
-add_attachments (TnyMsg *msg, GList *attachments_list)
+static TnyMimePart *
+add_html_body_part (TnyMsg *msg, 
+		    const gchar *body)
 {
-	GList *pos;
-	TnyMimePart *attachment_part, *old_attachment;
+	TnyMimePart *html_body_part = NULL;
+	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))));
+
+	/* 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_stream_reset (html_body_stream);
+
+	g_object_unref (G_OBJECT(html_body_part));
+
+	/* Clean */
+	g_object_unref (html_body_stream);
+
+	return html_body_part;
+}
+
+static TnyMimePart *
+copy_mime_part (TnyMimePart *part)
+{
+	TnyMimePart *result = NULL;
 	const gchar *attachment_content_type;
 	const gchar *attachment_filename;
+	const gchar *attachment_cid;
+	TnyList *parts;
+	TnyIterator *iterator;
 	TnyStream *attachment_stream;
 
+	if (TNY_IS_MSG (part)) {
+		g_object_ref (part);
+		return part;
+	}
+
+	result = tny_platform_factory_new_mime_part (
+		modest_runtime_get_platform_factory());
+
+	attachment_content_type = tny_mime_part_get_content_type (part);
+
+	/* get mime part headers */
+	attachment_filename = tny_mime_part_get_filename (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);
+	
+	/* set other mime part fields */
+	tny_mime_part_set_filename (result, attachment_filename);
+	tny_mime_part_set_content_id (result, attachment_cid);
+
+	/* copy subparts */
+	parts = tny_simple_list_new ();
+	tny_mime_part_get_parts (part, parts);
+	iterator = tny_list_create_iterator (parts);
+	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);
+			g_object_unref (subpart);
+		}
+
+		tny_iterator_next (iterator);
+	}
+	g_object_unref (iterator);
+	g_object_unref (parts);
+	g_object_unref (attachment_stream);
+
+	return result;
+}
+
+static void
+add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline)
+{
+	GList *pos;
+	TnyMimePart *attachment_part, *old_attachment;
+
 	for (pos = (GList *)attachments_list; pos; pos = pos->next) {
 
 		old_attachment = pos->data;
-		attachment_filename = tny_mime_part_get_filename (old_attachment);
-		attachment_stream = tny_mime_part_get_stream (old_attachment);
-		attachment_part = tny_platform_factory_new_mime_part (
-			modest_runtime_get_platform_factory());
-		
-		attachment_content_type = tny_mime_part_get_content_type (old_attachment);
-				 
-		tny_mime_part_construct_from_stream (attachment_part,
-						     attachment_stream,
-						     attachment_content_type);
-		tny_stream_reset (attachment_stream);
-		
-		tny_mime_part_set_filename (attachment_part, attachment_filename);
-		
-		tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
-/* 		g_object_unref (attachment_part); */
+		if (!tny_mime_part_is_purged (old_attachment)) {
+			attachment_part = copy_mime_part (old_attachment);
+			tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
+			tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", 
+						       add_inline?"inline":"attachment");
+			g_object_unref (attachment_part);
+		}
+	}
+}
+
+static void
+add_images (TnyMsg *msg, GList *images_list)
+{
+	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;
+			} else {
+				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);
 	}
 }
 
 
 gchar * 
-modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
+modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
 {
 	TnyStream *stream;
 	TnyMimePart *body;
 	GtkTextBuffer *buf;
 	GtkTextIter start, end;
 	gchar *to_quote;
+	gboolean result_was_html = TRUE;
 
 	body = modest_tny_msg_find_body_part(msg, want_html);
 	if (!body)
@@ -175,13 +335,22 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
 	tny_stream_reset (stream);
 	tny_mime_part_decode_to_stream (body, stream);
 	tny_stream_reset (stream);
-
-	g_object_unref (G_OBJECT(stream));
-	g_object_unref (G_OBJECT(body));
 	
 	gtk_text_buffer_get_bounds (buf, &start, &end);
 	to_quote = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
+	if (tny_mime_part_content_type_is (body, "text/plain")) {
+		gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote);
+		g_free (to_quote);
+		to_quote = to_quote_converted;
+		result_was_html = FALSE;
+	}
+
 	g_object_unref (buf);
+	g_object_unref (G_OBJECT(stream));
+	g_object_unref (G_OBJECT(body));
+
+	if (is_html != NULL)
+		*is_html = result_was_html;
 
 	return to_quote;
 }
@@ -190,11 +359,11 @@ modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
 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";
+	const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
 	TnyMimePart *part = NULL;
-	TnyList *parts;
-	TnyIterator *iter;
-
+	TnyList *parts = NULL;
+	TnyIterator *iter = NULL;
+	
 	if (!msg)
 		return NULL;
 
@@ -204,40 +373,57 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	iter  = tny_list_create_iterator(parts);
 
 	/* no parts? assume it's single-part message */
-	if (tny_iterator_is_done(iter)) 
+	if (tny_iterator_is_done(iter)) {
+		g_object_unref (G_OBJECT(iter));
 		return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
-	else {
-		gchar *content_type = NULL;
+	} else {
 		do {
+			gchar *content_type = NULL;
+			
 			part = TNY_MIME_PART(tny_iterator_get_current (iter));
 
+			if (!part) {
+				g_warning ("%s: not a valid mime part", __FUNCTION__);
+				continue;
+			}
+
+			/* it's a message --> ignore */
+			if (part && TNY_IS_MSG (part)) {
+				g_object_unref (part);
+				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);
-							
-			if (g_str_has_prefix (content_type, mime_type) &&
-			    !tny_mime_part_is_attachment (part))
+			content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+
+			if (g_str_has_prefix (content_type, desired_mime_type) && !tny_mime_part_is_attachment (part)) {
+				/* we found the desired mime-type! */
+				g_free (content_type);
 				break;
-			
-			if (g_str_has_prefix(content_type, "multipart")) {
+
+			} 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;
-			}
-			if (part)
+			} else
+				g_free (content_type);
+			
+			if (part) {
 				g_object_unref (G_OBJECT(part));
-
-			part = NULL;
+				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));
@@ -262,47 +448,58 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 }
 
 
+#define MODEST_TNY_MSG_PARENT_UID "parent-uid"
+
 static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type)
+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, *header;
+	TnyHeader *new_header;
 	gchar *new_subject;
-	TnyMimePart *body;
+	TnyMimePart *body = NULL;
 	ModestFormatter *formatter;
+	gchar *subject_prefix;
+	gboolean no_text_part;
+	
+	if (header)
+		g_object_ref (header);
+	else
+		header = tny_msg_get_header (msg);
 
 	/* Get body from original msg. Always look for the text/plain
 	   part of the message to create the reply/forwarded mail */
-	header = tny_msg_get_header (msg);
-	body   = modest_tny_msg_find_body_part (msg, FALSE);
-
-	/* TODO: select the formatter from account prefs */
-	formatter = modest_formatter_new ("text/plain");
-
-	/* 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);
-			break;
-		}
-	} else {
-		switch (type) {
-		case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
-		default:
-			new_msg = modest_formatter_inline  (formatter, body, header);
-			break;
-		case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
-			new_msg = modest_formatter_attach (formatter, body, header);
-			break;
-		}
+	if (msg != NULL)
+		body   = modest_tny_msg_find_body_part (msg, FALSE);
+	
+	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);
+
+
+	/* 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, no_text_part ? NULL: 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) 
+			new_msg = modest_formatter_attach (formatter, msg, header);
+		else 
+			new_msg = modest_formatter_inline  (formatter, body, header,
+							    attachments);
 	}
+	
 	g_object_unref (G_OBJECT(formatter));
-	g_object_unref (G_OBJECT(body));
+	if (body)
+		g_object_unref (G_OBJECT(body));
 	
 	/* Fill the header */
 	new_header = tny_msg_get_header (new_msg);	
@@ -310,48 +507,74 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu
 	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);
 	new_subject =
 		(gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
-							     (is_reply) ? _("Re:") : _("Fwd:"));
+							     subject_prefix);
+	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 */
+	if (new_msg) {
+		gchar* 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);
+	}
+	
 	/* 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 */
 
 	return new_msg;
 }
 
+const gchar*
+modest_tny_msg_get_parent_uid (TnyMsg *msg)
+{
+	g_return_val_if_fail (msg, NULL);
+	return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID);
+}
+
+
+
 static void
 add_if_attachment (gpointer data, gpointer user_data)
 {
 	TnyMimePart *part;
-	GList *attachments_list;
+	GList **attachments_list;
 
 	part = TNY_MIME_PART (data);
-	attachments_list = (GList *) user_data;
+	attachments_list = ((GList **) user_data);
 
-	if (tny_mime_part_is_attachment (part))
-		attachments_list = g_list_prepend (attachments_list, part);
+	if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) {
+		*attachments_list = g_list_prepend (*attachments_list, part);
+		g_object_ref (part);
+	}
 }
 
 TnyMsg* 
 modest_tny_msg_create_forward_msg (TnyMsg *msg, 
 				   const gchar *from,
+				   const gchar *signature,
 				   ModestTnyMsgForwardType forward_type)
 {
 	TnyMsg *new_msg;
 	TnyList *parts = NULL;
 	GList *attachments_list = NULL;
 
-	new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
-
 	/* Add attachments */
 	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);
-	add_attachments (new_msg, attachments_list);
+	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 (TNY_MIME_PART (new_msg), attachments_list, FALSE);
 
 	/* Clean */
 	if (attachments_list)
@@ -362,22 +585,43 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
 }
 
 TnyMsg* 
-modest_tny_msg_create_reply_msg (TnyMsg *msg, 
+modest_tny_msg_create_reply_msg (TnyMsg *msg,
+				 TnyHeader *header,
 				 const gchar *from,
+				 const gchar *signature,
 				 ModestTnyMsgReplyType reply_type,
 				 ModestTnyMsgReplyMode reply_mode)
 {
 	TnyMsg *new_msg = NULL;
-	TnyHeader *new_header, *header;
+	TnyHeader *new_header;
 	const gchar* reply_to;
 	gchar *new_cc = NULL;
 	const gchar *cc = NULL, *bcc = NULL;
 	GString *tmp = NULL;
+	TnyList *parts = NULL;
+	GList *attachments_list = NULL;
 
-	new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
+	/* 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);
+	}
+
+	new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
+					     attachments_list);
+	if (attachments_list) {
+		g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
+		g_list_free (attachments_list);
+	}
+	if (parts)
+		g_object_unref (G_OBJECT (parts));
 
 	/* Fill the header */
-	header = tny_msg_get_header (msg);
+	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);