diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index fe231da4fe..941eb10fc0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2416,6 +2416,7 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
 		fread(buf, len, 1, p);
 		((char *)buf)[len] = '\0';
 		INIT(&str, mail_string, buf, len);
+		init_mailstream(vms, 0);
 		imap_mailbox_name(mailbox, vms, 0, 1);
 		if(!mail_append(vms->mailstream, mailbox, &str))
 			ast_log(LOG_ERROR, "Error while sending the message to %s\n", mailbox);
@@ -2530,8 +2531,7 @@ static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
 		init_vm_state(vms_p);
 		vmstate_insert(vms_p);
 	}
-	if (!vms_p->mailstream)
-		ret = init_mailstream(vms_p, 0);
+	ret = init_mailstream(vms_p, 0);
 	if (!vms_p->mailstream) {
 		ast_log (LOG_ERROR,"IMAP mailstream is NULL\n");
 		return -1;