case 'h':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (Hostname));
+ snprintf (buf, buflen, fmt, NONULL (mod_core.shorthost));
break;
case 'f':
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version(0));
+ m_strcpy(buf, buflen, mutt_make_version());
break;
case 'V':