--- apps/app_voicemail2.c.orig	2003-11-11 17:06:30.000000000 -0600
+++ apps/app_voicemail2.c	2003-11-11 17:20:50.000000000 -0600
@@ -2537,8 +2537,10 @@
 					cmd = play_and_wait(chan, "vm-undeleted");
 				break;
 			case '8':
-				if(vms.lastmsg > -1)
+				if((vms.lastmsg >= 0) && (vms.curmsg >= 0)) 
 					cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts);
+				else
+					cmd = play_and_wait(chan, "vm-nomore");
 				break;
 			case '9':
 				if (useadsi)