diff --git a/calendar/inc/footer.inc.php b/calendar/inc/footer.inc.php
index 74c3c0ad74..c34b163f0a 100644
--- a/calendar/inc/footer.inc.php
+++ b/calendar/inc/footer.inc.php
@@ -27,11 +27,12 @@
 	$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
 	
 	$templates = Array(
-		'footer'	=>	'footer.tpl',
-		'footer_column'	=>	'footer_column.tpl'
+		'footer'	=>	'footer.tpl'
 	);
 
 	$p->set_file($templates);
+	$p->set_block('footer','footer_table','footer_table');
+	$p->set_block('footer','footer_row','footer_row');
 
 	if ($phpgw->calendar->tempyear && $phpgw->calendar->tempmonth)
 	{
@@ -79,7 +80,7 @@
 
 	$p->set_var($var);
 	
-	$p->parse('output','footer_column',True);
+	$p->parse('table_row','footer_row',True);
 
 	$str = '';
 
@@ -159,7 +160,7 @@
 
 	$p->set_var($var);
 	
-	$p->parse('output','footer_column',True);
+	$p->parse('table_row','footer_row',True);
 
 	if ($phpgw->calendar->tempyear)
 	{
@@ -192,8 +193,8 @@
 
 	$p->set_var($var);
 	
-	$p->parse('output','footer_column',True);
+	$p->parse('table_row','footer_row',True);
 
-	$p->pparse('out','footer');
+	$p->pparse('out','footer_table');
 ?>
 
diff --git a/calendar/templates/default/footer.tpl b/calendar/templates/default/footer.tpl
index 80db9b5e24..4d23242602 100755
--- a/calendar/templates/default/footer.tpl
+++ b/calendar/templates/default/footer.tpl
@@ -1,8 +1,26 @@
+<!-- $Id$ -->
+<!-- BEGIN footer_table -->
        <br clear="all">
        <hr clear="all">
        <font size="-1">
        <table border="0" width="100%" cellpadding="0" cellspacing="0">
         <tr>
-{output}
+{table_row}
 	</tr>
        </table>
+<!-- END footer_table -->
+<!-- BEGIN footer_row -->
+         <td valign="top" width="33%">
+          <font size="-1">
+           <form action="{action_url}" method="post" name="{form_name}">
+            <B>{label}:</B>
+            <select name="{form_label}" onchange="{form_onchange}">
+	     {row}
+	    </select>
+            <noscript><input type="submit" value="{go}"></noscript>
+	   </form>
+	  </font>
+	 </td>
+<!-- END footer_row -->
+
+