diff --git a/home.php b/home.php
index 9cb762c95e..a365ad7b2d 100755
--- a/home.php
+++ b/home.php
@@ -60,13 +60,15 @@
 				$extra_vars .= '&' . $name . '=' . urlencode($value);
 			}
 		}
-		$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link($GLOBALS['phpgw_forward'],$extra_vars));
+		$GLOBALS['phpgw']->redirect_link($GLOBALS['phpgw_forward'],$extra_vars);
 	}
 
 	$GLOBALS['phpgw']->translation->add_app('mainscreen');
 	if (lang('mainscreen_message') != 'mainscreen_message'.lang_char())
 	{
-		echo '<center>' . stripslashes(lang('mainscreen_message')) . '</center>';
+		$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
+			'mainscreen_message' => stripslashes(lang('mainscreen_message'))
+		));
 	}
 
 	if ((isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
@@ -212,6 +214,7 @@
 		}
 		$GLOBALS['phpgw']->preferences->save_repository();
 	}
+	$GLOBALS['phpgw_info']['flags']['currentapp'] = 'home';	// has been changed by hook_home's
 
 	$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
 	}
diff --git a/phpgwapi/templates/default/msgbox.xsl b/phpgwapi/templates/default/msgbox.xsl
index 387eb37a68..4789e8a6a1 100644
--- a/phpgwapi/templates/default/msgbox.xsl
+++ b/phpgwapi/templates/default/msgbox.xsl
@@ -17,7 +17,7 @@
 							<xsl:text>'; return true;</xsl:text>
 						</xsl:attribute>
 					</img><xsl:text> </xsl:text>
-					<xsl:value-of select="msgbox_text"/>
+					<xsl:value-of disable-output-escaping="yes" select="msgbox_text"/>
 				</td>
 			</tr>
 		</table>
diff --git a/phpgwapi/templates/default/portal.xsl b/phpgwapi/templates/default/portal.xsl
index a914375feb..db9eb8d059 100644
--- a/phpgwapi/templates/default/portal.xsl
+++ b/phpgwapi/templates/default/portal.xsl
@@ -1,13 +1,18 @@
 <!-- $Id$ -->
 
 	<xsl:template name="portal">
+		<xsl:choose>
+			<xsl:when test="mainscreen_message != ''">
+				<xsl:value-of disable-output-escaping="yes" select="mainscreen_message"/>
+			</xsl:when>
+		</xsl:choose>
 		<xsl:apply-templates select="portal_data"/>
 	</xsl:template>
 
 	<xsl:template match="portal_data">
 		<table cellpadding="0" cellspacing="0" class="portal">
- 			<tr>
-  				<td class="portal_text">
+			<tr>
+				<td class="portal_text">
 					<xsl:value-of disable-output-escaping="yes" select="space"/>
 					<xsl:value-of select="title"/>
 				</td>
@@ -15,8 +20,8 @@
 					<xsl:apply-templates select="control_link"/>
 				</td>
 			</tr>
- 			<tr>
-  				<td colspan="2">
+			<tr>
+				<td colspan="2">
 					<table cellpadding="3" cellspacing="0" class="portal">
 						<xsl:choose>
 							<xsl:when test="listbox != ''">
@@ -49,6 +54,7 @@
   				</td>
  			</tr>
 		</table>
+		<br/>
 	</xsl:template>
 
 	<xsl:template match="control_link">