+ g_free (content_type);
+
+ /* Add attachments */
+ add_attachments (new_msg, (GList*) attachments);
+
+ 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,
+ GSList *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);
+ 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);
+
+ content_type = get_content_type(plain_body);
+
+ /* Add the body of the new mail */
+ add_html_body_part (new_msg, html_body);
+ add_body_part (new_msg, plain_body, content_type, TRUE);
+ g_free (content_type);