diff --git a/mail/inc/class.mail_activesync.inc.php b/mail/inc/class.mail_activesync.inc.php
index 48c041d2e2..4806d139ef 100644
--- a/mail/inc/class.mail_activesync.inc.php
+++ b/mail/inc/class.mail_activesync.inc.php
@@ -159,7 +159,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
 		$identities = array();
 		if (!isset($params['setup']))
 		{
-			$profileID=(self::$profileID=='G'?emailadmin_bo::getDefaultAccID():self::$profileID);
+			$profileID=(self::$profileID=='G'?emailadmin_account::get_default_acc_id():self::$profileID);
 			if (!$this->mail) $this->mail = mail_bo::getInstance(true,$profileID,true,false,true);
 			foreach($allIdentities as $key => $singleIdentity) {
 				if (isset($identities[$singleIdentity['acc_id']])) continue; // only use the first
diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index e82c42946d..cfad4bf577 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -16,32 +16,6 @@
 class mail_hooks
 {
 	/**
-	 * Menu for Admin >> Edit accounts
-	 */
-	static public function adminMenu()
-	{
-		if (($default_profile_id = emailadmin_bo::getDefaultAccID()))
-		{
-			$mail_bo = mail_bo::forceEAProfileLoad($default_profile_id);
-
-			$ogServer = $mail_bo->mailPreferences->getOutgoingServer($default_profile_id);
-			//error_log(__METHOD__."() default_profile_id = $default_profile_id, get_class(ogServer)=".get_class($ogServer));
-
-			if (!in_array(get_class($ogServer), array('defaultsmtp', 'emailadmin_smtp')))
-			{
-				global $menuData;
-
-				$menuData[] = Array
-				(
-					'description'   => 'email settings',
-					'url'           => '/index.php',
-					'extradata'     => 'menuaction=emailadmin.uiuserdata.editUserData'
-				);
-			}
-		}
-	}
-
-	/**
      * Hook called by link-class to include mail in the appregistry of the linkage
      *
      * @param array/string $location location and other parameters (not used)