--- app_voicemail.c	2005-04-17 20:11:19.000000000 -0700
+++ app_voicemail.new	2005-04-17 20:09:37.000000000 -0700
@@ -4735,7 +4735,9 @@
 					vms.curmsg--;
 					cmd = play_message(chan, vmu, &vms);
 				} else {
-					cmd = ast_play_and_wait(chan, "vm-nomore");
+                    cmd = ast_play_and_wait(chan, "vm-nomore");
+					vms.curmsg=vms.lastmsg;
+					cmd = play_message(chan, vmu, &vms);
 				}
 				break;
 			case '6':
@@ -4743,7 +4745,9 @@
 					vms.curmsg++;
 					cmd = play_message(chan, vmu, &vms);
 				} else {
-					cmd = ast_play_and_wait(chan, "vm-nomore");
+                    cmd = ast_play_and_wait(chan, "vm-nomore");
+					vms.curmsg=vms.starting;
+					cmd = play_message(chan, vmu, &vms);
 				}
 				break;
 			case '7':