#include <lib-mime/mime.h>
#include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "handler.h"
|| (option (OPTPGPLONGIDS)
&& !m_strncasecmp(p, "0x", 2)
&& !m_strcasecmp(p + 2, crypt_keyid (k) + 8))
- || str_isstr (k->uid, p)) {
+ || m_stristr(k->uid, p)) {
crypt_key_t *tmp;
debug_print (5, ("match.\n"));