diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 50fc66a5ab..51b278ff8a 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1167,6 +1167,28 @@
     			}
 			$tpl->set_var('app_css', $app_css);
 			
+			// search for app specific css file
+			if(@isset($GLOBALS['phpgw_info']['flags']['currentapp']))
+			{
+				$appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
+				
+				if(file_exists(PHPGW_SERVER_ROOT . SEP . $appname . SEP .
+					       'templates' . SEP . $GLOBALS['phpgw_info']['server']['template_set'] . 
+					       SEP . 'app.css'))
+				{
+					$tpl->set_var('css_file', '<LINK href="'.$GLOBALS['phpgw_info']['server']['webserver_url']
+					."/$appname/templates/".$GLOBALS['phpgw_info']['server']['template_set']
+					."/app.css".'" type=text/css rel=StyleSheet>');
+				}
+				elseif(file_exists(PHPGW_SERVER_ROOT . SEP . $appname . SEP .
+					       'templates' . SEP . 'default' . 
+					       SEP . 'app.css'))
+				{
+					$tpl->set_var('css_file', '<LINK href="'.$GLOBALS['phpgw_info']['server']['webserver_url']
+					."/$appname/templates/default/app.css".'" type=text/css rel=StyleSheet>');
+				}
+			}
+			
 			return $tpl->subst('css');			
 		}
 		/**
diff --git a/phpgwapi/templates/default/css.tpl b/phpgwapi/templates/default/css.tpl
index c5cbff23ac..0296d2b39c 100755
--- a/phpgwapi/templates/default/css.tpl
+++ b/phpgwapi/templates/default/css.tpl
@@ -12,3 +12,4 @@
 	{app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file
diff --git a/phpgwapi/templates/idots/css.tpl b/phpgwapi/templates/idots/css.tpl
index 6df65bff67..526d17dd12 100755
--- a/phpgwapi/templates/idots/css.tpl
+++ b/phpgwapi/templates/idots/css.tpl
@@ -6,3 +6,4 @@
 	{app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file
diff --git a/phpgwapi/templates/idsociety/css.tpl b/phpgwapi/templates/idsociety/css.tpl
index c5cbff23ac..0296d2b39c 100755
--- a/phpgwapi/templates/idsociety/css.tpl
+++ b/phpgwapi/templates/idsociety/css.tpl
@@ -12,3 +12,4 @@
 	{app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file
diff --git a/phpgwapi/templates/justweb/css.tpl b/phpgwapi/templates/justweb/css.tpl
index c5cbff23ac..0296d2b39c 100755
--- a/phpgwapi/templates/justweb/css.tpl
+++ b/phpgwapi/templates/justweb/css.tpl
@@ -12,3 +12,4 @@
 	{app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file
diff --git a/phpgwapi/templates/linux-at-work.de/css.tpl b/phpgwapi/templates/linux-at-work.de/css.tpl
index 3e2d8f39b9..7def96cbe2 100755
--- a/phpgwapi/templates/linux-at-work.de/css.tpl
+++ b/phpgwapi/templates/linux-at-work.de/css.tpl
@@ -183,3 +183,4 @@
 {app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file
diff --git a/phpgwapi/templates/verdilak/css.tpl b/phpgwapi/templates/verdilak/css.tpl
index c5cbff23ac..0296d2b39c 100755
--- a/phpgwapi/templates/verdilak/css.tpl
+++ b/phpgwapi/templates/verdilak/css.tpl
@@ -12,3 +12,4 @@
 	{app_css}
 -->
 </style>
+{css_file}
\ No newline at end of file