WHERE char Quotebuf[SHORT_STRING];
-#if defined(DL_STANDALONE) && defined(USE_DOTLOCK)
WHERE char *MuttDotlock;
-#endif
-WHERE ADDRESS *EnvFrom;
-WHERE ADDRESS *From;
+WHERE address_t *EnvFrom;
+WHERE address_t *From;
WHERE char *AliasFile;
WHERE char *AliasFmt;