const char *mutt_charset_hook (const char *);
const char *mutt_iconv_hook (const char *);
-ssize_t _mutt_expand_path (char *, ssize_t, int);
-#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), 0)
+ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
+#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)
char *mutt_find_hook (int, const char *);
char *mutt_get_body_charset (char *, ssize_t, BODY *);