Vicks

--- app_voicemail.c	2008-09-05 12:35:54.000000000 -0400
+++ app_voicemail.c2	2008-11-06 19:49:24.000000000 -0500
@@ -1144,7 +1144,8 @@
 static int messagecount(const char *context, const char *mailbox, const char *folder)
 {
 	SEARCHPGM *pgm;
-	SEARCHHEADER *hdr;
+	SEARCHHEADER *hdrc;
+	SEARCHHEADER *hdrm;

 	struct ast_vm_user *vmu, vmus;
 	struct vm_state *vms_p;
@@ -1203,8 +1204,10 @@
 	}
 	if (ret == 0) {
 		pgm = mail_newsearchpgm ();
-		hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)mailbox);
-		pgm->header = hdr;
+		hdrc = mail_newsearchheader ("X-Asterisk-VM-Context", (char *)context);
+		hdrm = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)mailbox);
+		hdrm->next = hdrc;
+		pgm->header = hdrm;
 		if (fold != 1) {
 			pgm->unseen = 1;
 			pgm->seen = 0;