Index: kernel/application.php
===================================================================
--- kernel/application.php	(revision 14944)
+++ kernel/application.php	(working copy)
@@ -927,12 +927,13 @@
 	 */
 	public function redirectToMaintenance()
 	{
-		$maintenance_page = WRITEBALE_BASE . '/maintenance.html';
+        $maintenance_page = WRITEBALE_BASE . '/maintenance.html';
+        // $query_string = $this->isAdmin ? '' : '?next_template=' . urlencode($_SERVER['REQUEST_URI']); // get next_template from query string if needed
 
-		if ( file_exists(FULL_PATH . $maintenance_page) ) {
-			header('Location: ' . BASE_PATH . $maintenance_page, true, 301);
-			exit;
-		}
+        if ( file_exists(FULL_PATH . $maintenance_page) ) {
+            header('Location: ' . BASE_PATH . $maintenance_page);
+            exit;
+        }
 	}
 
 	/**
@@ -955,7 +956,6 @@
 			$maintenance_template = $this->isAdmin ? 'login' : $this->ConfigValue('SoftMaintenanceTemplate');
 
 			if ( $this->GetVar('t') != $maintenance_template ) {
-				$redirect_params = Array ('response_code' => 301);
 
 				if (!$this->isAdmin) {
 					$redirect_params['next_template'] = urlencode($_SERVER['REQUEST_URI']);