diff --git a/api/src/Contacts/Merge.php b/api/src/Contacts/Merge.php
index 7ef9e64df6..c1240cbfee 100644
--- a/api/src/Contacts/Merge.php
+++ b/api/src/Contacts/Merge.php
@@ -287,11 +287,6 @@ class Merge extends Api\Storage\Merge
 
 	protected static function customise_mail_actions(&$action)
 	{
-		if ($action['children']['message/rfc822'])
-		{
-			// Just email already filtered out
-			$action['children'] = $action['children']['message/rfc822']['children'];
-		}
 		if(strpos($action['egw_open'], 'edit-mail') === 0)
 		{
 			unset($action['confirm_multiple']);
diff --git a/api/src/Link/Sharing.php b/api/src/Link/Sharing.php
index 746d98dd48..5b7aff90f7 100644
--- a/api/src/Link/Sharing.php
+++ b/api/src/Link/Sharing.php
@@ -88,6 +88,11 @@ class Sharing extends \EGroupware\Api\Sharing
 			$documents['order'] = 20;
 
 			// Mail only
+			if ($documents['children']['message/rfc822'])
+			{
+				// Just email already filtered out
+				$documents['children'] = $documents['children']['message/rfc822']['children'];
+			}
 			foreach($documents['children'] as $key => &$document)
 			{
 				if(strpos($document['target'],'compose_') === FALSE)