diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index dc60925ea2..069163f8c9 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 
 	$text['title']['en-us'] = "Fax Server";
 	$text['title']['es-cl'] = "Servidor de Fax";
@@ -10,10 +10,10 @@
 	$text['description']['pt-pt'] = "Para receber um FAX configure uma extensão de fax e encaminhe o tráfego de entrada para essa extensão.";
 	$text['description']['fr-fr'] = "Afin de recevoir un Fax, configurer une extension et rediriger l'appel sur celle-ci.";
 
-	$text['confirm-delete']['en-us'] = "Are you sure you want to delete this?";
-	$text['confirm-delete']['es-cl'] = "&iquest;Realmente desea eliminar esto?";
-	$text['confirm-delete']['pt-pt'] = "Tem a certeza que deseja remover?";
-	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['message-confirm-delete']['en-us'] = "Are you sure you want to delete this?";
+	$text['message-confirm-delete']['es-cl'] = "&iquest;Realmente desea eliminar esto?";
+	$text['message-confirm-delete']['pt-pt'] = "Tem a certeza que deseja remover?";
+	$text['message-confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 
 	$text['label-extension']['en-us'] = "Extension";
 	$text['label-extension']['es-cl'] = "Extensión";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 3acd05c897..40b6382348 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -112,7 +112,7 @@ require_once "resources/paging.php";
 		if (strlen($order_by) == 0) { $sql .= "order by f.fax_name asc "; }
 	}
 	if (strlen($order_by) > 0) {
-		$sql .= "order by $order_by $order "; 
+		$sql .= "order by $order_by $order ";
 	}
 	$sql .= "limit $rows_per_page offset $offset ";
 	$prep_statement = $db->prepare(check_sql($sql));
@@ -154,7 +154,7 @@ require_once "resources/paging.php";
 					echo "		<a href='fax_view.php?id=".$row['fax_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 				}
 				if (permission_exists('fax_extension_delete')) {
-					echo "		<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+					echo "		<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$text['message-confirm-delete']."')\">$v_link_label_delete</a>\n";
 				}
 				echo "	</td>\n";
 				echo "</tr>\n";
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 077e4c7f20..1c78eb1cdf 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -46,7 +46,7 @@ else {
 		$fax_uuid = check_str($_REQUEST["id"]);
 	}
 
-//get the data 
+//get the data
 	$sql = "select * from v_fax ";
 	$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 	$sql .= "and fax_uuid = '$fax_uuid' ";
@@ -108,12 +108,8 @@ else {
 	unset($sql);
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
-	echo "<div align='center'>\n";
-	echo "".$text['confirm-copy']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['confirm-copy'];
+	header("Location: fax.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index 9095a52638..4204329908 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -96,12 +96,8 @@ else {
 	}
 
 //redirect the user
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
-	echo "<div align='center'>\n";
-	echo "".$text['confirm-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
+	$_SESSION["message"] = $text['confirm-delete'];
+	header("Location: fax.php");
 	return;
 
 ?>
\ No newline at end of file
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index a2811f95f0..5568173f22 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -74,7 +74,7 @@ else {
 				chmod($dir_fax_inbox,0774);
 			}
 			if (!is_dir($dir_fax_sent)) {
-				mkdir($dir_fax_sent,0774,true); 
+				mkdir($dir_fax_sent,0774,true);
 				chmod($dir_fax_sent,0774);
 			}
 			if (!is_dir($dir_fax_temp)) {
@@ -133,10 +133,8 @@ else {
 			$db->exec(check_sql($sql));
 
 		//redirect the browser
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
-			echo "<div align='center'>".$text['confirm-delete']."</div>";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['confirm-delete'];
+			header("Location: fax_edit.php?id=".$fax_uuid);
 			return;
 	}
 
@@ -163,15 +161,13 @@ else {
 			$db->exec($sql_insert);
 
 		//redirect the browser
-			require_once "resources/header.php";
-			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
-			echo "<div align='center'>".$text['confirm-add']."</div>";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['confirm-add'];
+			header("Location: fax_edit.php?id=".$fax_uuid);
 			return;
 	}
 
 //clear file status cache
-	clearstatcache(); 
+	clearstatcache();
 
 if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
@@ -473,17 +469,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				}
 
 			//redirect the browser
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
-				echo "<div align='center'>\n";
 				if ($action == "update" && permission_exists('fax_extension_edit')) {
-					echo "".$text['confirm-update']."\n";
+					$_SESSION["message"] = $text['confirm-update'];
 				}
 				if ($action == "add" && permission_exists('fax_extension_add')) {
-					echo "".$text['confirm-add']."\n";
+					$_SESSION["message"] = $text['confirm-add'];
 				}
-				echo "</div>\n";
-				require_once "resources/footer.php";
+				header("Location: fax.php");
 				return;
 
 		} //if ($_POST["persistformvar"] != "true")
@@ -657,7 +649,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "			<tr>\n";
 				echo "				<td class='vtable'>".$field['username']."</td>\n";
 				echo "				<td>\n";
-				echo "					<a href='fax_edit.php?id=".$fax_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+				echo "					<a href='fax_edit.php?id=".$fax_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['message-confirm-delete']."')\">$v_link_label_delete</a>\n";
 				echo "				</td>\n";
 				echo "			</tr>\n";
 			}