diff --git a/app.c b/app.c
index e6c7f4625a..bdd76ce849 100644
--- a/app.c
+++ b/app.c
@@ -552,7 +552,6 @@ int ast_play_and_record(struct ast_channel *chan, const char *playfile, const ch
 	struct ast_dsp *sildet=NULL;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;
 	struct ast_silence_generator *silgen = NULL;
 
@@ -675,7 +674,7 @@ int ast_play_and_record(struct ast_channel *chan, const char *playfile, const ch
 						if (option_verbose > 2)
 							ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 						ast_frfree(f);
-						gotsilence = 1;
+						res = 'S';
 						outmsg=2;
 						break;
 					}
@@ -779,7 +778,6 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf
 	struct ast_dsp *sildet;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;	
 	char prependfile[80];
 	
@@ -898,7 +896,7 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf
 					if (option_verbose > 2) 
 						ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 					ast_frfree(f);
-					gotsilence = 1;
+					res = 'S';
 					outmsg=2;
 					break;
 					}
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e44323d183..ed9d3622c8 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3294,7 +3294,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
 				cmd = 't';
 		 }
 	}
-	if (cmd == 't')
+	if (cmd == 't' || cmd == 'S')
 		cmd = 0;
 	return cmd;
 }