diff --git a/mail/setup/default_records.inc.php b/mail/setup/default_records.inc.php
index 4be8539b34..c7e3e6b579 100644
--- a/mail/setup/default_records.inc.php
+++ b/mail/setup/default_records.inc.php
@@ -6,11 +6,22 @@
  * @package mail
  * @subpackage setup
  * @author Stylite AG [info@stylite.de]
- * @copyright (c) 2013 by Stylite AG <info-AT-stylite.de>
+ * @copyright (c) 2014 by Stylite AG <info-AT-stylite.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
 
-// give Default group rights for new mail app
-$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-$GLOBALS['egw_setup']->add_acl('mail','run',$defaultgroup);
+// change felamimail run rights to new mail app
+$GLOBALS['egw_setup']->db->update('egw_acl', array(
+	'acl_appname' => 'mail',
+), array(
+	'acl_appname' => 'felamimail',
+	'acl_location' => 'run',
+), __LINE__, __FILE__);
+
+// if no rows/rights found, give Default group rights
+if (!$GLOBALS['egw_setup']->db->affected_rows())
+{
+	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
+	$GLOBALS['egw_setup']->add_acl('mail','run',$defaultgroup);
+}