Round 2 of IMAP_STORAGE app_voicemail.c fixes: