diff --git a/contrib/scripts/vmail.cgi b/contrib/scripts/vmail.cgi
index cd519d7017..fb22f116e6 100755
--- a/contrib/scripts/vmail.cgi
+++ b/contrib/scripts/vmail.cgi
@@ -600,6 +600,12 @@ sub message_rename()
 	my ($context, $mbox, $oldfolder, $old, $newfolder, $new) = @_;
 	my $oldfile, $newfile;
 	return if ($old eq $new) && ($oldfolder eq $newfolder);
+
+        if ($context =~ /^(\w+)$/) {
+                $context = $1;
+        } else {
+                die("Invalid Context<BR>\n");
+        }
 	
 	if ($mbox =~ /^(\w+)$/) {
 		$mbox = $1;
diff --git a/vmail.cgi b/vmail.cgi
index cd519d7017..fb22f116e6 100755
--- a/vmail.cgi
+++ b/vmail.cgi
@@ -600,6 +600,12 @@ sub message_rename()
 	my ($context, $mbox, $oldfolder, $old, $newfolder, $new) = @_;
 	my $oldfile, $newfile;
 	return if ($old eq $new) && ($oldfolder eq $newfolder);
+
+        if ($context =~ /^(\w+)$/) {
+                $context = $1;
+        } else {
+                die("Invalid Context<BR>\n");
+        }
 	
 	if ($mbox =~ /^(\w+)$/) {
 		$mbox = $1;