2 files changed, 24 insertions, 6 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 7f667f5b45..578639bee1 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -56,9 +56,18 @@ if($board_config['gzip_compress'])
 //
 // Parse and show the overall header.
 //
-$template->set_filenames(array(
-	"overall_header" => "overall_header.tpl")
-);
+if( empty($gen_simple_header) )
+{
+	$template->set_filenames(array(
+		"overall_header" => "overall_header.tpl")
+	);
+}
+else
+{
+	$template->set_filenames(array(
+		"overall_header" => "simple_header.tpl")
+	);
+}
 
 //
 // Generate logged in/logged out status
diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php
index 12fb490384..dd761e77cb 100644
--- a/phpBB/includes/page_tail.php
+++ b/phpBB/includes/page_tail.php
@@ -33,9 +33,18 @@ else
 }
 $current_time = time();
 
-$template->set_filenames(array(
-	"overall_footer" => "overall_footer.tpl")
-);
+if( empty($gen_simple_header) )
+{
+	$template->set_filenames(array(
+		"overall_footer" => "overall_footer.tpl")
+	);
+}
+else
+{
+	$template->set_filenames(array(
+		"overall_footer" => "simple_footer.tpl")
+	);
+}
 
 $template->assign_vars(array(
 	"PHPBB_VERSION" => "2.0 beta-1",