diff --git a/src/main/java/com/researchspace/webapp/controller/MessageAndRequestController.java b/src/main/java/com/researchspace/webapp/controller/MessageAndRequestController.java
index 6d9727bcb..f968069ab 100644
--- a/src/main/java/com/researchspace/webapp/controller/MessageAndRequestController.java
+++ b/src/main/java/com/researchspace/webapp/controller/MessageAndRequestController.java
@@ -172,11 +172,6 @@ public AjaxReturnObject<List<UserBasicInfo>> getRecipients(
       if (shouldAddToRecipients(user, subject)) {
         userInfos.add(user.toBasicInfo());
       }
-      /* recipients list displayed in autocomplete shows only 10 users,
-       * so no need to return more from the server (see RSPAC-1252) */
-      if (userInfos.size() > 10) {
-        break;
-      }
     }
     if (userInfos.isEmpty()) {
       ErrorList errors =
diff --git a/src/main/webapp/scripts/pages/workspace/editor/tinymce5_configuration.js b/src/main/webapp/scripts/pages/workspace/editor/tinymce5_configuration.js
index 032f84f47..658dc9856 100644
--- a/src/main/webapp/scripts/pages/workspace/editor/tinymce5_configuration.js
+++ b/src/main/webapp/scripts/pages/workspace/editor/tinymce5_configuration.js
@@ -243,6 +243,12 @@ var tinymcesetup = {
 
 	// 'mention' plugin comes from https://github.com/StevenDevooght/tinyMCE-mention
 	mentions: {
+		items: Infinity,
+
+		renderDropdown: function() {
+			return '<ul class="rte-autocomplete dropdown-menu mentions-list-wrapper"></ul>';
+		},
+
 		// get the items to be shown in the pop up box
 		source(query, process, delimiter) {
 			let id = $('.rs-global-id a:not(.recordInfoIcon)').text().replace(/\D/g, '');
diff --git a/src/main/webapp/styles/pages/workspace/workspace.css b/src/main/webapp/styles/pages/workspace/workspace.css
index faf4083ca..8ea914a75 100644
--- a/src/main/webapp/styles/pages/workspace/workspace.css
+++ b/src/main/webapp/styles/pages/workspace/workspace.css
@@ -614,3 +614,8 @@ img[id^="sharedStatusImg_"], .witnessedImg, .favoriteImg {
 #fileBrowsing #fancyTree {
     padding-bottom: 5px;
 }
+
+.mentions-list-wrapper {
+  height: 10rem;
+  overflow-y: auto;
+}