--- apps/app_voicemail2.c.orig	2003-11-11 18:38:19.000000000 -0600
+++ apps/app_voicemail2.c	2003-11-11 18:38:05.000000000 -0600
@@ -2539,6 +2539,8 @@
 			case '8':
 				if(vms.lastmsg > -1)
 					cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts);
+				else
+					cmd = play_and_wait(chan, "vm-nomore");
 				break;
 			case '9':
 				if (useadsi)