diff --git a/calendar/index.php b/calendar/index.php
index 31a6c39ce7..163f19c183 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -10,4 +10,5 @@
  * @version $Id$
  */
 
-header('Location: ../index.php?menuaction=calendar.calendar_uiviews.index');
+header('Location: ../index.php?menuaction=calendar.calendar_uiviews.index'.
+	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
diff --git a/etemplate/index.php b/etemplate/index.php
index 31b9ac438d..690ba68e2b 100644
--- a/etemplate/index.php
+++ b/etemplate/index.php
@@ -1,24 +1,14 @@
 <?php
-	/**************************************************************************\
-	* eGroupWare - eTemplates - Editor                                         *
-	* http://www.egroupware.org                                                *
-	* Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-	* --------------------------------------------                             *
-	*  This program is free software; you can redistribute it and/or modify it *
-	*  under the terms of the GNU General Public License as published by the   *
-	*  Free Software Foundation; either version 2 of the License, or (at your  *
-	*  option) any later version.                                              *
-	\**************************************************************************/
+/**
+ * eGroupWare - eTemplates - Editor
+ *
+ * @link http://www.egroupware.org
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @package etemplate
+ * @copyright (c) 2002-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @version $Id$
+ */
 
-	/* $Id$ */
-
-	$GLOBALS['egw_info'] = array(
-		'flags' => array(
-			'currentapp'	=> 'etemplate',
-			'noheader'		=> True,
-			'nonavbar'		=> True,
-		),
-	);
-	include('../header.inc.php');
-
-	$GLOBALS['egw']->redirect_link('/index.php','menuaction=etemplate.editor.edit');
+header('Location: ../index.php?menuaction=etemplate.editor.edit'.
+	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));
diff --git a/filemanager/index.php b/filemanager/index.php
index 1ba0709cf8..c500a9faa9 100755
--- a/filemanager/index.php
+++ b/filemanager/index.php
@@ -1,11 +1,14 @@
 <?php
 /**
- * Filemanager - user interface
+ * eGroupWare - Filemanager - user interface
  *
  * @link http://www.egroupware.org
  * @package filemanager
+ * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2008 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
-	
-header('Location: ../index.php?menuaction=filemanager.filemanager_ui.index');
+
+header('Location: ../index.php?menuaction=filemanager.filemanager_ui.index'.
+	(isset($_GET['sessionid']) ? '&sessionid='.$_GET['sessionid'].'&kp3='.$_GET['kp3'] : ''));