--- app_voicemail-old.c	2009-08-10 15:30:55.000000000 -0400
+++ app_voicemail.c	2009-09-18 15:30:42.000000000 -0400
@@ -1679,8 +1679,7 @@
 	if (ret == 0) {
 		ast_mutex_lock(&vms_p->lock);
 		pgm = mail_newsearchpgm ();
-		hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)(!ast_strlen_zero(vmu->imapvmshareid) ? vmu->imapvmshareid : mailbox));
-		hdr->next = mail_newsearchheader("X-Asterisk-VM-Context", (char *) S_OR(context, "default"));
+		hdr = mail_newsearchheader("X-Asterisk-VM-Message-Type", "Message");
 		pgm->header = hdr;
 		if (fold != 1) {
 			pgm->unseen = 1;
@@ -2127,8 +2126,7 @@
 	pgm = mail_newsearchpgm();
 
 	/* Check IMAP folder for Asterisk messages only... */
-	hdr = mail_newsearchheader("X-Asterisk-VM-Extension", (!ast_strlen_zero(vmu->imapvmshareid) ? vmu->imapvmshareid : vmu->mailbox));
-	hdr->next = mail_newsearchheader("X-Asterisk-VM-Context", vmu->context);
+	hdr = mail_newsearchheader("X-Asterisk-VM-Message-Type", "Message");
 	pgm->header = hdr;
 	pgm->deleted = 0;
 	pgm->undeleted = 1;