Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 7849)
+++ apps/app_voicemail.c	(working copy)
@@ -2342,17 +2342,14 @@ static int leave_voicemail(struct ast_ch
 	ext = tmp;
 	context = strchr(tmp, '@');
 	if (context) {
-		*context = '\0';
-		context++;
+		*context++ = '\0';
 		tmpptr = strchr(context, '&');
 	} else {
 		tmpptr = strchr(ext, '&');
 	}
 
-	if (tmpptr) {
-		*tmpptr = '\0';
-		tmpptr++;
-	}
+	if (tmpptr)
+		*tmpptr++ = '\0';
 
 	category = pbx_builtin_getvar_helper(chan, "VM_CATEGORY");