Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 262656)
+++ apps/app_voicemail.c	(working copy)
@@ -1905,10 +1905,16 @@
 			pgm->seen = 1;
 		}
 		/* look for urgent messages */
-		if (urgent) {
-			pgm->flagged = 1;
-			pgm->unflagged = 0;
+		if (fold == 0) {
+			if (urgent) {
+				pgm->flagged = 1;
+				pgm->unflagged = 0;
+			} else {
+				pgm->flagged = 0;
+				pgm->unflagged = 1;
+			}
 		}
+
 		pgm->undeleted = 1;
 		pgm->deleted = 0;