diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index 8fea7e2f00..8ed45bfa59 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -1384,7 +1384,9 @@ class egw_db
 		}
 
 		// if name contains special characters, quote it
-		if ( preg_match('/\W/', $name) ) {
+		// always quote for postgreSQL, as this is the only way to support mixed case names
+		if (preg_match('/\W/', $name) || $this->Type == 'pgsql' && preg_match('/[A-Z]+/', $name))
+		{
 			return $quote . $name . $quote;
 		}