diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index b058c42a41..600013f95d 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1313,18 +1313,20 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
$GLOBALS['phpgw_info']['flags']['body_tags']['link'] = $GLOBALS['phpgw_info']['theme']['link'];
$GLOBALS['phpgw_info']['flags']['body_tags']['vlink'] = $GLOBALS['phpgw_info']['theme']['vlink'];
- $GLOBALS['phpgw_info']['flags']['body_tags']['marginwidth']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['marginheight']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['topmargin']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['bottommargin']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['rightmargin']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
- $GLOBALS['phpgw_info']['flags']['body_tags']['border']='0';
+ if (!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
+ {
+ $GLOBALS['phpgw_info']['flags']['body_tags']['marginwidth']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['marginheight']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['topmargin']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['bottommargin']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['rightmargin']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['leftmargin']='0';
+ $GLOBALS['phpgw_info']['flags']['body_tags']['border']='0';
+ }
$GLOBALS['phpgw_info']['flags']['body_tags']['onLoad'] .= $this->load_preload_images_data();
-
if(@is_array($GLOBALS['phpgw_info']['flags']['body_tags']))
{
$body_tags_string = '';
diff --git a/phpgwapi/templates/default/parts.tpl b/phpgwapi/templates/default/parts.tpl
index 820513cb52..b633a83fad 100644
--- a/phpgwapi/templates/default/parts.tpl
+++ b/phpgwapi/templates/default/parts.tpl
@@ -2,7 +2,7 @@
| {user_info} |
- {applications} |
+ {applications}
diff --git a/phpgwapi/templates/default/phpgw.tpl b/phpgwapi/templates/default/phpgw.tpl
index ec64d3c0a3..fd88a4b894 100644
--- a/phpgwapi/templates/default/phpgw.tpl
+++ b/phpgwapi/templates/default/phpgw.tpl
@@ -15,8 +15,8 @@
{phpgw_css}
{phpgw_head_tags}
-
-
+
+
| {phpgw_top} |
@@ -56,7 +56,7 @@
{phpgw_css}
{phpgw_head_tags}
-
+
{phpgw_msgbox}