User-Agent, not X-Mailer.

diff --git a/init.h b/init.h
index 46ed648df0f554aefe25607e13b8f84c418b51be..b27093c529c659ec9d35a5225afdaf0216b4774a 100644 (file)
--- a/init.h
+++ b/init.h
@@ -283,13 +283,13 @@ struct option_t MuttVars[] = {
   { "use_8bitmime",    DT_BOOL, R_NONE, OPTUSE8BITMIME, 0 },
   { "use_domain",      DT_BOOL, R_NONE, OPTUSEDOMAIN, 1 },
   { "use_from",                DT_BOOL, R_NONE, OPTUSEFROM, 1 },
+  { "user_agent",      DT_BOOL, R_NONE, OPTXMAILER, 1},
   { "visual",          DT_PATH, R_NONE, UL &Visual, 0 },
   { "wait_key",                DT_BOOL, R_NONE, OPTWAITKEY, 1 },
   { "wrap_search",     DT_BOOL, R_NONE, OPTWRAPSEARCH, 1 },
   { "write_inc",       DT_NUM,  R_NONE, UL &WriteInc, 10 },
   { "write_bcc",       DT_BOOL, R_NONE, OPTWRITEBCC, 1},
-  { "x_mailer",                DT_BOOL, R_NONE, OPTXMAILER, 1},
-  { NULL }
+    { NULL }
 };
 
 const struct mapping_t SortMethods[] = {

diff --git a/sendlib.c b/sendlib.c
index 9002abc7fe02d8ae7bbeb0002938fe9ce2d215c8..f9602b85bf63238c14769d138efbe53897aa2f8d 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1339,7 +1339,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
   if (mode == 0 && !privacy && option (OPTXMAILER))
   {
     /* Add a vanity header */
-    fprintf (fp, "X-Mailer: Mutt %s\n", MUTT_VERSION);
+    fprintf (fp, "User-Agent: Mutt/%s\n", MUTT_VERSION);
   }
 
   /* Add any user defined headers */