diff --git a/etemplate/inc/class.customfields_widget.inc.php b/etemplate/inc/class.customfields_widget.inc.php
index f685c3179a..18e51cf505 100644
--- a/etemplate/inc/class.customfields_widget.inc.php
+++ b/etemplate/inc/class.customfields_widget.inc.php
@@ -539,7 +539,7 @@ class customfields_widget
 
 		if (is_null($link_types))
 		{
-			$link_types = array_keys(egw_link::app_list());
+			$link_types = array_keys(array_intersect(egw_link::app_list('query'),egw_link::app_list('title')));
 			$link_types[] = 'link-entry';
 		}
 		return $link_types;
diff --git a/phpgwapi/inc/class.egw_link.inc.php b/phpgwapi/inc/class.egw_link.inc.php
index 7d54ebc0d1..2d7bc0b7cb 100644
--- a/phpgwapi/inc/class.egw_link.inc.php
+++ b/phpgwapi/inc/class.egw_link.inc.php
@@ -108,12 +108,6 @@ class egw_link extends solink
 	 * @var array
 	 */
 	static $app_register = array(
-		'felamimail' => array(
-			'add' => array(
-				'menuaction' => 'felamimail.uicompose.compose',
-			),
-			'add_popup' => '700x750',
-		),
 		'home-accounts' => array(	// user need run-rights for home
 			'name' => 'Accounts',
 			'icon' => 'addressbook/accounts',