diff --git a/app/modules/module_delete.php b/app/modules/module_delete.php
index a31a3ed385..7fdec2c0df 100644
--- a/app/modules/module_delete.php
+++ b/app/modules/module_delete.php
@@ -52,12 +52,8 @@ if (strlen($id)>0) {
 	unset($sql);
 }
 
-require_once "resources/header.php";
-echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.php\">\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: modules.php");
 return;
 
 ?>
\ No newline at end of file
diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 6f1ba7e983..5d4217439b 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -115,12 +115,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				save_module_xml();
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.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: modules.php");
 				return;
 			} //if ($action == "add")
 
@@ -138,12 +134,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 				save_module_xml();
 
-				require_once "resources/header.php";
-				echo "<meta http-equiv=\"refresh\" content=\"2;url=modules.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: modules.php");
 				return;
 			} //if ($action == "update")
 		} //if ($_POST["persistformvar"] != "true")