diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
index 9c4836c2eb..7ee9cf63e1 100644
--- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php
+++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php
@@ -32,6 +32,7 @@ use OCP\Contacts\IManager;
 use OCP\Federation\ICloudIdManager;
 use OCP\IConfig;
 use OCP\IGroupManager;
+use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share;
 use Test\TestCase;
@@ -98,6 +99,12 @@ class MailPluginTest extends TestCase {
 
 		$this->instantiatePlugin();
 
+		$currentUser = $this->createMock(IUser::class);
+		$currentUser->method('getUID')
+			->willReturn('current');
+		$this->userSession->method('getUser')
+			->willReturn($currentUser);
+
 		$this->contactsManager->expects($this->any())
 			->method('search')
 			->with($searchTerm, ['EMAIL', 'FN'])
@@ -340,7 +347,93 @@ class MailPluginTest extends TestCase {
 				['users' => [], 'exact' => ['users' => [['label' => 'User (test@example.com)','value' => ['shareType' => 0, 'shareWith' => 'test'],]]]],
 				true,
 				false,
-			]
+			],
+			// Current local user found by email => no result
+			[
+				'test@example.com',
+				[
+					[
+						'FN' => 'User',
+						'EMAIL' => ['test@example.com'],
+						'CLOUD' => ['current@localhost'],
+						'isLocalSystemBook' => true,
+					]
+				],
+				true,
+				['exact' => []],
+				false,
+				false,
+			],
+			// Pagination and "more results" for user matches byyyyyyy emails
+			[
+				'test@example',
+				[
+					[
+						'FN' => 'User1',
+						'EMAIL' => ['test@example.com'],
+						'CLOUD' => ['test1@localhost'],
+						'isLocalSystemBook' => true,
+					],
+					[
+						'FN' => 'User2',
+						'EMAIL' => ['test@example.de'],
+						'CLOUD' => ['test2@localhost'],
+						'isLocalSystemBook' => true,
+					],
+					[
+						'FN' => 'User3',
+						'EMAIL' => ['test@example.org'],
+						'CLOUD' => ['test3@localhost'],
+						'isLocalSystemBook' => true,
+					],
+					[
+						'FN' => 'User4',
+						'EMAIL' => ['test@example.net'],
+						'CLOUD' => ['test4@localhost'],
+						'isLocalSystemBook' => true,
+					],
+				],
+				true,
+				['users' => [
+					['label' => 'User1 (test@example.com)','value' => ['shareType' => 0, 'shareWith' => 'test1']],
+					['label' => 'User2 (test@example.de)','value' => ['shareType' => 0, 'shareWith' => 'test2']],
+				], 'emails' => [], 'exact' => ['users' => [], 'emails' => []]],
+				false,
+				true,
+			],
+			// Pagination and "more results" for normal emails
+			[
+				'test@example',
+				[
+					[
+						'FN' => 'User1',
+						'EMAIL' => ['test@example.com'],
+						'CLOUD' => ['test1@localhost'],
+					],
+					[
+						'FN' => 'User2',
+						'EMAIL' => ['test@example.de'],
+						'CLOUD' => ['test2@localhost'],
+					],
+					[
+						'FN' => 'User3',
+						'EMAIL' => ['test@example.org'],
+						'CLOUD' => ['test3@localhost'],
+					],
+					[
+						'FN' => 'User4',
+						'EMAIL' => ['test@example.net'],
+						'CLOUD' => ['test4@localhost'],
+					],
+				],
+				true,
+				['emails' => [
+					['label' => 'User1 (test@example.com)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.com']],
+					['label' => 'User2 (test@example.de)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@example.de']],
+				], 'exact' => ['emails' => []]],
+				false,
+				true,
+			],
 		];
 	}