X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffer.c;h=68c1374d64c8895f8c59ecf99f6de5231b01da56;hp=e8c638f49cd1828c78f8e8d59c68cf7193de32f9;hb=7132fe3b1612c153f3638d1f9664ba9eab9063d6;hpb=bbc4fd52516a8afefbd14c77e34f8389d6f0a6ed

diff --git a/buffer.c b/buffer.c
index e8c638f..68c1374 100644
--- a/buffer.c
+++ b/buffer.c
@@ -257,8 +257,12 @@ int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
         var = str_substrdup (tok->dptr, pc);
         tok->dptr = pc;
       }
-      if (var && (env = getenv (var)))
-        mutt_buffer_addstr (dest, env);
+      if (var) {
+        char tmp[STRING];
+        if ((env = getenv (var)) || 
+            (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp)))
+          mutt_buffer_addstr (dest, env);
+      }
       mem_free (&var);
     }
     else