From 3dc8b0b52200b236e6f44450ca7913c52b83f85a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 30 Jan 2012 14:33:50 +0100
Subject: Bug #651221 - "Edit as New Message" always uses default From: address
---
mail/em-composer-utils.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
(limited to 'mail/em-composer-utils.c')
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index fdd3322a63..3dd93c1891 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1299,6 +1299,30 @@ em_utils_edit_message (EShell *shell,
}
composer = e_msg_composer_new_with_message (shell, message, NULL);
+ if (folder && !folder_is_templates) {
+ EComposerHeaderTable *table;
+ EAccount *account;
+ CamelStore *store;
+ const gchar *uid;
+ gchar *folder_uri;
+ GList *list;
+
+ table = e_msg_composer_get_header_table (composer);
+
+ store = camel_folder_get_parent_store (folder);
+ uid = camel_service_get_uid (CAMEL_SERVICE (store));
+ account = e_get_account_by_uid (uid);
+
+ folder_uri = e_mail_folder_uri_from_folder (folder);
+
+ list = g_list_prepend (NULL, folder_uri);
+ e_composer_header_table_set_post_to_list (table, list);
+ g_list_free (list);
+
+ g_free (folder_uri);
+
+ e_composer_header_table_set_account (table, account);
+ }
e_msg_composer_remove_header (
composer, "X-Evolution-Replace-Outbox-UID");
--
cgit