diff --git a/app/contacts/contact_address_delete.php b/app/contacts/contact_address_delete.php
index 346d2ed104..836d5ed0b8 100644
--- a/app/contacts/contact_address_delete.php
+++ b/app/contacts/contact_address_delete.php
@@ -56,12 +56,8 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "resources/header.php";
-echo "<meta http-equiv=\"refresh\" content=\"2;url=contact_edit.php?id=$contact_uuid\">\n";
-echo "<div align='center'>\n";
-echo $text['message-delete']."\n";
-echo "</div>\n";
-require_once "resources/footer.php";
+$_SESSION["message"] = $text['message-delete'];
+header("Location: contact_edit.php?id=".$contact_uuid);
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php
index f9cc615521..9cb79df39b 100644
--- a/app/contacts/contact_address_edit.php
+++ b/app/contacts/contact_address_edit.php
@@ -139,12 +139,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "add")
 
@@ -167,12 +163,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
diff --git a/app/contacts/contact_delete.php b/app/contacts/contact_delete.php
index 2fc5bac374..7cd8563a5b 100644
--- a/app/contacts/contact_delete.php
+++ b/app/contacts/contact_delete.php
@@ -80,13 +80,9 @@ if (strlen($id)>0) {
 		unset($prep_statement, $sql);
 }
 
-//redirect the browser
-	require_once "resources/header.php";
-	echo "<meta http-equiv=\"refresh\" content=\"2;url=contacts.php\">\n";
-	echo "<div align='center'>\n";
-	echo $text['message-delete']."\n";
-	echo "</div>\n";
-	require_once "resources/footer.php";
-	return;
+
+$_SESSION["message"] = $text['message-delete'];
+header("Location: contacts.php");
+return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index c8e64ccf82..9c022a3199 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -138,12 +138,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=contacts.php\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: contacts.php");
 			return;
 		} //if ($action == "add")
 
@@ -166,12 +162,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=contacts.php\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: contacts.php");
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
diff --git a/app/contacts/contact_note_delete.php b/app/contacts/contact_note_delete.php
index 2d3aba426e..f8d8dd2c28 100644
--- a/app/contacts/contact_note_delete.php
+++ b/app/contacts/contact_note_delete.php
@@ -55,12 +55,8 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "resources/header.php";
-echo "<meta http-equiv=\"refresh\" content=\"2;url=contact_edit.php?id=$contact_uuid\">\n";
-echo "<div align='center'>\n";
-echo $text['message-delete']."\n";
-echo "</div>\n";
-require_once "resources/footer.php";
+$_SESSION["message"] = $text['message-delete'];
+header("Location: contact_edit.php?id=".$contact_uuid);
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php
index bb166ea14f..0f5554358d 100644
--- a/app/contacts/contact_note_edit.php
+++ b/app/contacts/contact_note_edit.php
@@ -110,12 +110,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "add")
 
@@ -130,12 +126,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")
diff --git a/app/contacts/contact_phone_delete.php b/app/contacts/contact_phone_delete.php
index 51774cb586..caaced5f00 100644
--- a/app/contacts/contact_phone_delete.php
+++ b/app/contacts/contact_phone_delete.php
@@ -55,13 +55,8 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "resources/header.php";
-echo "<meta http-equiv=\"refresh\" content=\"2;url=contact_edit.php?id=$contact_uuid\">\n";
-echo "<div align='center'>\n";
-echo $text['message-delete']."\n";
-echo "</div>\n";
-
-require_once "resources/footer.php";
+$_SESSION["message"] = $text['message-delete'];
+header("Location: contact_edit.php?id=".$contact_uuid);
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index defe6129ce..bda49e3c3d 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -114,12 +114,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-add']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-add'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "add")
 
@@ -135,12 +131,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=contact_edit.php?id=$contact_uuid\">\n";
-			echo "<div align='center'>\n";
-			echo $text['message-update']."\n";
-			echo "</div>\n";
-			require_once "resources/footer.php";
+			$_SESSION["message"] = $text['message-update'];
+			header("Location: contact_edit.php?id=".$contact_uuid);
 			return;
 		} //if ($action == "update")
 	} //if ($_POST["persistformvar"] != "true")