Remove bcc header from notmuch reply.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 333e945f09d01abfe225bc589190dd8496506314..aa58178573190a92dcfa5a615e587cf39ce739a4 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -317,7 +317,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
     char *domain=NULL;
     char *tld=NULL;
     const char *delim=". \t";
-    size_t i,other_len;
+    size_t i,j,other_len;
 
     const char *to_headers[] = {"Envelope-to", "X-Original-To"};
 
@@ -348,10 +348,10 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
                free(tohdr);
                return primary;
            }
-           for (i = 0; i < other_len; i++)
-               if (strcasestr (tohdr, other[i])) {
+           for (j = 0; j < other_len; j++)
+               if (strcasestr (tohdr, other[j])) {
                    free(tohdr);
-                   return other[i];
+                   return other[j];
                }
            free(tohdr);
        }
@@ -481,9 +481,6 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
        g_mime_object_set_header (GMIME_OBJECT (reply),
                                  "From", from_addr);
 
-       g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
-                          notmuch_config_get_user_primary_email (config));
-
        in_reply_to = talloc_asprintf (ctx, "<%s>",
                             notmuch_message_get_message_id (message));
 
@@ -558,9 +555,6 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q
 
        (void)add_recipients_from_message (reply, config, message);
 
-       g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
-                          notmuch_config_get_user_primary_email (config));
-
        reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));
        printf ("%s", reply_headers);
        free (reply_headers);