diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php
index b315eda549..c84da455ff 100644
--- a/app/voicemail_greetings/app_languages.php
+++ b/app/voicemail_greetings/app_languages.php
@@ -51,27 +51,31 @@
 	$text['button-save']['pt-pt'] = "Guardar";
 	$text['button-save']['fr-fr'] = "Sauvegarder";
 
-	//voicemail_greeting_delete
-	$text['confirm-delete']['en-us'] = "Delete Complete";
-	$text['message-delete']['es-cl'] = "Eliminación Completada";
-	$text['confirm-delete']['pt-pt'] = "Remoção Efectuada";
-	$text['confirm-delete']['fr-fr'] = "Supprimé";
-
 	//voicemail_greeting_edit
 	$text['confirm-name']['en-us'] = "Please provide: Greeting Name (play)";
 	$text['confirm-name']['es-cl'] = "Por favor indique: Nombre de Bienvenida (reproducir)";
 	$text['confirm-name']['pt-pt'] = "Por favor indique: Nome da saudação (tocar)";
 	$text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom de salutation (jouer)";
 
-	$text['confirm-add']['en-us'] = "Add Complete";
+	$text['message-add']['en-us'] = "Add Complete";
 	$text['message-add']['es-cl'] = "Agregar Completado";
-	$text['confirm-add']['pt-pt'] = "Adição Efectuada";
-	$text['confirm-add']['fr-fr'] = "Ajouté";
+	$text['message-add']['pt-pt'] = "Adição Efectuada";
+	$text['message-add']['fr-fr'] = "Ajouté";
 
-	$text['confirm-update']['en-us'] = "Update Complete";
+	$text['message-update']['en-us'] = "Update Complete";
 	$text['message-update']['es-cl'] = "Actualización Completada";
-	$text['confirm-update']['pt-pt'] = "Actualização Efectuada";
-	$text['confirm-update']['fr-fr'] = "Mis à jour";
+	$text['message-update']['pt-pt'] = "Actualização Efectuada";
+	$text['message-update']['fr-fr'] = "Mis à jour";
+
+	$text['message-delete']['en-us'] = "Delete Complete";
+	$text['message-delete']['es-cl'] = "Eliminación Completada";
+	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
+	$text['message-delete']['fr-fr'] = "Supprimé";
+
+	$text['message-uploaded']['en-us'] = "Upload Complete";
+	$text['message-uploaded']['es-cl'] = "Subida Finalizada";
+	$text['message-uploaded']['pt-pt'] = "Carregar Completa";
+	$text['message-uploaded']['fr-fr'] = "Enregistrer Complet";
 
 	$text['label-add']['en-us'] = "Add Greeting";
 	$text['label-add']['es-cl'] = "Agregar Saludo";
diff --git a/app/voicemail_greetings/voicemail_greeting_delete.php b/app/voicemail_greetings/voicemail_greeting_delete.php
index bf5e1dcecf..e33827604a 100644
--- a/app/voicemail_greetings/voicemail_greeting_delete.php
+++ b/app/voicemail_greetings/voicemail_greeting_delete.php
@@ -77,11 +77,7 @@ if (strlen($id)>0) {
 }
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=$voicemail_id\">\n";
-	echo "<div align='center'>\n";
-	echo "".$text['confirm-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['message-delete'];
+	header("Location: voicemail_greetings.php?id=".$voicemail_id);
 	return;
 ?>
\ No newline at end of file
diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index b5b6ce4fcc..d62ecd46f3 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -105,12 +105,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$db->exec(check_sql($sql));
 			unset($sql);
 
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=".$voicemail_id."\">\n";
-			echo "<div align='center'>\n";
-			echo "".$text['confirm-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: voicemail_greetings.php?id=".$voicemail_id);
 			return;
 		} //if ($action == "add")
 
@@ -145,12 +141,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				unset($sql);
 
 			//redirect the user
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=voicemail_greetings.php?id=".$voicemail_id."\">\n";
-				echo "<div align='center'>\n";
-				echo "".$text['confirm-update']."\n";
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				$_SESSION["message"] = $text['message-update'];
+				header("Location: voicemail_greetings.php?id=".$voicemail_id);
 				return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 2f81b8c5a9..6996d1f103 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -91,7 +91,7 @@ else {
 			if ($_REQUEST['greeting']) {
 				mkdir($v_greeting_dir, 0777, true);
 				move_uploaded_file($_FILES['file']['tmp_name'], $v_greeting_dir.'/'.$_REQUEST['greeting']);
-				$save_msg = "Uploaded ".$_REQUEST['greeting'];
+				$_SESSION["message"] = $text['message-uploaded'].": ".$_REQUEST['greeting'];
 			}
 		}
 	}
@@ -196,7 +196,7 @@ else {
 		}
 	}
 
-//get the number of rows in v_extensions 
+//get the number of rows in v_extensions
 	$sql = "select greeting_id from v_voicemails ";
 	$sql .= "where domain_uuid = '$domain_uuid' ";
 	$sql .= "and voicemail_id = '$voicemail_id' ";
@@ -211,11 +211,6 @@ else {
 //include the header
 	require_once "resources/header.php";
 
-//show the message
-	if (strlen($save_msg) > 0) {
-		echo "Message: ".$save_msg;
-	}
-
 //begin the content
 	echo "<script>\n";
 	echo "function EvalSound(soundobj) {\n";
@@ -234,7 +229,7 @@ else {
 	echo "<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' width=\"50%\">\n";
-	echo "			<span class='title'>".$text['title'].":</span><br>\n";
+	echo "			<span class='title'>".$text['title']."</span><br>\n";
 	echo "		</td>";
 	echo "		<td width='50%' align='right'>\n";
 	echo "			<label for=\"file\">".$text['label-upload'].":</label>\n";
@@ -254,7 +249,7 @@ else {
 
 	echo "<br />\n";
 
-	//get the number of rows in v_voicemail_greetings 
+	//get the number of rows in v_voicemail_greetings
 		$sql = "select count(*) as num_rows from v_voicemail_greetings ";
 		$sql .= "where domain_uuid = '$domain_uuid' ";
 		$sql .= "and voicemail_id = '$voicemail_id' ";
@@ -275,9 +270,9 @@ else {
 		$rows_per_page = 100;
 		$param = "";
 		$page = $_GET['page'];
-		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } 
-		list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page); 
-		$offset = $rows_per_page * $page; 
+		if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+		list($paging_controls, $rows_per_page, $var_3) = paging($num_rows, $param, $rows_per_page);
+		$offset = $rows_per_page * $page;
 
 	//get the greetings list
 		$sql = "select * from v_voicemail_greetings ";