#endif
#include "mutt.h"
-#include "mutt_regex.h"
#include "mailbox.h"
#include "mime.h"
#include "rfc2047.h"
#include "mutt_crypt.h"
#include "url.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+
#include <string.h>
#include <ctype.h>
#include <sys/stat.h>
*buf = '\0';
if (mutt_match_spam_list (line, SpamList, buf, sizeof (buf))) {
- if (!mutt_match_rx_list (line, NoSpamList)) {
+ if (!rx_list_match (NoSpamList, line)) {
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {