From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 15 Jun 2009 18:38:36 +0000 (+0200)
Subject: Again, we forward message as attachment if it's an html message (fixes NB#110254)
X-Git-Tag: 3.0.17-rc16~25
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=1086c27e5c28f025850f513f513583720b5057a4

Again, we forward message as attachment if it's an html message (fixes NB#110254)
---

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index d0ee511..5bda254 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -682,14 +682,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 		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);
-		}
+		new_msg = modest_formatter_attach (formatter, msg, header);
 	}
 
 	g_object_unref (G_OBJECT(formatter));