sync with sylpheed 0.6.0cvs4

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index e0cfea7218893e4b1fee00b01406f15e04d361d5..a56c70e3382ab00687dba903c36d1a422af87499 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1080,6 +1080,8 @@ void compose_reedit(MsgInfo *msginfo)
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 
+        account = msginfo->folder->folder->account;
+
         if(!account&& prefs_common.reedit_account_autosel) {
                        gchar from[BUFFSIZE];
                if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
@@ -2660,12 +2662,9 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                        if (*str != '\0') {
                                compose->to_list = address_list_append
                                        (compose->to_list, str);
-                               if (is_draft) {
-                                       compose_convert_header
-                                               (buf, sizeof(buf), str,
-                                                strlen("Bcc: "));
-                                       fprintf(fp, "Bcc: %s\n", buf);
-                               }
+                               compose_convert_header(buf, sizeof(buf), str,
+                                                      strlen("Bcc: "));
+                               fprintf(fp, "Bcc: %s\n", buf);
                        }
                }
        }