13 files changed, 423 insertions, 72 deletions

diff --git a/mh/comp.c b/mh/comp.c
index 075bb4516..29389c69e 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -127,15 +127,16 @@ copy_message (mu_mailbox_t mbox, size_t n, const char *file)
   return rc;
 }
 
+static struct mh_optinit optinit[] = {
+  { "draftfolder", "Draft-Folder" },
+  { "whatnowproc", "whatnowproc" },
+  { NULL }
+};
+
 int
 main (int argc, char **argv)
 {
-  mh_getopt (&argc, &argv, options, 0, args_doc, prog_doc, NULL);
-
-  if (!draftfolder)
-    draftfolder = mh_global_profile_get ("Draft-Folder", NULL);
-  if (!whatnowproc)
-    whatnowproc = mh_global_profile_get ("whatnowproc", NULL);
+  mh_getopt_ext (&argc, &argv, options, 0, optinit, args_doc, prog_doc, NULL);
 
   if (use_draft)
     draftmessage = "cur";
diff --git a/mh/forw.c b/mh/forw.c
index 5e0e08b97..016ac84bc 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -377,17 +377,19 @@ finish_draft ()
   mu_stream_destroy (&stream);
 }
 
+static struct mh_optinit optinit[] = {
+  { "draftfolder", "Draft-Folder" },
+  { "whatnowproc", "whatnowproc" },
+  { NULL }
+};
+
 int
 main (int argc, char **argv)
 {
   int rc;
 
-  mh_getopt (&argc, &argv, options, MH_GETOPT_DEFAULT_FOLDER,
-             args_doc, prog_doc, NULL);
-  if (!draftfolder)
-    draftfolder = mh_global_profile_get ("Draft-Folder", NULL);
-  if (!whatnowproc)
-    whatnowproc = mh_global_profile_get ("whatnowproc", NULL);
+  mh_getopt_ext (&argc, &argv, options, MH_GETOPT_DEFAULT_FOLDER, optinit,
+                 args_doc, prog_doc, NULL);
   if (!formfile)
     mh_find_file ("forwcomps", &formfile);
   
diff --git a/mh/mh.h b/mh/mh.h
index 69be72de2..76bc85e37 100644
--- a/mh/mh.h
+++ b/mh/mh.h
@@ -342,7 +342,11 @@ int mh_usedraft (const char *filename);
 int mh_file_copy (const char *from, const char *to);
 char *mh_draft_name (void);
 char *mh_create_message_id (int);
-int mh_whom (const char *filename, int check);
+
+int mh_whom_header (mu_header_t hdr);
+int mh_whom_file (const char *filename, int check);
+int mh_whom_message (mu_message_t msg, int check);
+
 void mh_set_reply_regex (const char *str);
 int mh_decode_2047 (char *text, char **decoded_text);
 const char *mh_charset (const char *);
diff --git a/mh/mh_alias_gram.y b/mh/mh_alias_gram.y
index d7229983a..26b13ec83 100644
--- a/mh/mh_alias_gram.y
+++ b/mh/mh_alias_gram.y
@@ -502,6 +502,9 @@ int
 mh_read_aliases (void)
 {
   const char *p;
+
+  if (alias_list)
+    return 0;
   
   p = mh_global_profile_get ("Aliasfile", NULL);
   if (p)
diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c
index 65fe3e8c7..16a6e5c55 100644
--- a/mh/mh_getopt.c
+++ b/mh/mh_getopt.c
@@ -179,10 +179,39 @@ has_folder_option (struct mu_option *opt)
   return 0;
 }
 
+static void
+opt_init (struct mu_parseopt *po,
+          struct mu_option **optv, struct mh_optinit *optinit)
+{
+  if (!optinit)
+    return;
+  for (; optinit->opt; optinit++)
+    {
+      size_t i;
+      for (i = 0; optv[i]; i++)
+        {
+          struct mu_option *opt;
+          for (opt = optv[i]; !MU_OPTION_IS_END (opt); opt++)
+            {
+              if (strcmp (opt->opt_long, optinit->opt) == 0)
+                {
+                  char const *val = mh_global_profile_get (optinit->var, NULL);
+                  if (val)
+                    {
+                      (opt->opt_set ?
+                       opt->opt_set : mu_option_set_value) (po, opt, val);
+                    }
+                  break;
+                }
+            }
+        }
+    }
+}
+
 void
-mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
-           int mhflags,
-           char *argdoc, char *progdoc, char *extradoc)
+mh_getopt_ext (int *pargc, char ***pargv, struct mu_option *options,
+               int mhflags, struct mh_optinit *optinit,
+               char *argdoc, char *progdoc, char *extradoc)
 {
   int argc = *pargc;
   char **argv = *pargv;
@@ -256,6 +285,7 @@ mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
   if (options)
     optv[i++] = options;
   optv[i] = NULL;
+  opt_init (&po, optv, optinit);
   
   if (mu_parseopt (&po, argc, argv, optv, flags))
     exit (po.po_exit_error);
@@ -285,6 +315,14 @@ mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
 }
 
 void
+mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
+           int mhflags, char *argdoc, char *progdoc, char *extradoc)
+{
+  mh_getopt_ext (pargc, pargv, options, mhflags, NULL, argdoc, progdoc,
+                 extradoc);
+}
+
+void
 mh_opt_notimpl (struct mu_parseopt *po, struct mu_option *opt, char const *arg)
 {
   mu_error (_("option is not yet implemented: %s"), opt->opt_long);
diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h
index 2aa90b669..684ace678 100644
--- a/mh/mh_getopt.h
+++ b/mh/mh_getopt.h
@@ -20,9 +20,18 @@
 
 #define MH_GETOPT_DEFAULT_FOLDER 0x1
 
+struct mh_optinit
+{
+  char const *opt;   /* Option name */
+  char const *var;   /* mh_property name */
+};
+
+void mh_getopt_ext (int *pargc, char ***pargv, struct mu_option *options,
+                    int mhflags, struct mh_optinit *optinit,
+                    char *argdoc, char *progdoc, char *extradoc);
+
 void mh_getopt (int *pargc, char ***pargv, struct mu_option *options,
-                int flags,
-                char *argdoc, char *progdoc, char *extradoc);
+                int flags, char *argdoc, char *progdoc, char *extradoc);
 
 void mh_opt_notimpl (struct mu_parseopt *po, struct mu_option *opt,
                      char const *arg);
diff --git a/mh/mh_whatnow.c b/mh/mh_whatnow.c
index 5dc15b553..0bd2acabe 100644
--- a/mh/mh_whatnow.c
+++ b/mh/mh_whatnow.c
@@ -544,9 +544,10 @@ whom (struct mh_whatnow_env *wh, int argc, char **argv, int *status)
   if (!wh->file)
     mu_error (_("no draft file to display"));
   else
-    mh_whom (wh->file, (argc == 2
-                        && (strcmp (argv[1], "-check") == 0
-                            || strcmp (argv[1], "--check") == 0)));
+    mh_whom_file (wh->file,
+                  (argc == 2
+                   && (strcmp (argv[1], "-check") == 0
+                       || strcmp (argv[1], "--check") == 0)));
   return 0;
 }
 
diff --git a/mh/mh_whom.c b/mh/mh_whom.c
index bbdef7ac5..f3067d1ab 100644
--- a/mh/mh_whom.c
+++ b/mh/mh_whom.c
@@ -261,7 +261,46 @@ read_header (mu_stream_t stream)
 }
 
 int
-mh_whom (const char *filename, int check)
+mh_whom_header (mu_header_t hdr)
+{
+  size_t count = 0;
+  int rc;
+  const char *val;
+
+  mh_read_aliases ();
+
+  if (mu_header_sget_value (hdr, MU_HEADER_TO, &val) == 0)