diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt
index a4fb587d19a..14efaaac634 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt
@@ -4,7 +4,7 @@
  * @author David González Verdugo
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -33,6 +33,8 @@ import com.owncloud.android.data.capabilities.datasources.implementation.OCRemot
 import com.owncloud.android.data.capabilities.datasources.mapper.RemoteCapabilityMapper
 import com.owncloud.android.data.files.datasources.RemoteFileDataSource
 import com.owncloud.android.data.files.datasources.implementation.OCRemoteFileDataSource
+import com.owncloud.android.data.members.datasources.RemoteMembersDataSource
+import com.owncloud.android.data.members.datasources.implementation.OCRemoteMembersDataSource
 import com.owncloud.android.data.oauth.datasources.RemoteOAuthDataSource
 import com.owncloud.android.data.oauth.datasources.implementation.OCRemoteOAuthDataSource
 import com.owncloud.android.data.roles.datasources.RemoteRolesDataSource
@@ -76,6 +78,7 @@ val remoteDataSourceModule = module {
     singleOf(::OCRemoteAuthenticationDataSource) bind RemoteAuthenticationDataSource::class
     singleOf(::OCRemoteCapabilitiesDataSource) bind RemoteCapabilitiesDataSource::class
     singleOf(::OCRemoteFileDataSource) bind RemoteFileDataSource::class
+    singleOf(::OCRemoteMembersDataSource) bind RemoteMembersDataSource::class
     singleOf(::OCRemoteOAuthDataSource) bind RemoteOAuthDataSource::class
     singleOf(::OCRemoteRolesDataSource) bind RemoteRolesDataSource::class
     singleOf(::OCRemoteServerInfoDataSource) bind RemoteServerInfoDataSource::class
diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt
index ae4ea9fcf79..44e1e762781 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt
@@ -6,7 +6,7 @@
  * @author Juan Carlos Garrote Gascón
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -28,6 +28,7 @@ import com.owncloud.android.data.authentication.repository.OCAuthenticationRepos
 import com.owncloud.android.data.capabilities.repository.OCCapabilityRepository
 import com.owncloud.android.data.files.repository.OCFileRepository
 import com.owncloud.android.data.folderbackup.repository.OCFolderBackupRepository
+import com.owncloud.android.data.members.repository.OCMembersRepository
 import com.owncloud.android.data.oauth.repository.OCOAuthRepository
 import com.owncloud.android.data.roles.repository.OCRolesRepository
 import com.owncloud.android.data.server.repository.OCServerInfoRepository
@@ -43,6 +44,7 @@ import com.owncloud.android.domain.authentication.oauth.OAuthRepository
 import com.owncloud.android.domain.automaticuploads.FolderBackupRepository
 import com.owncloud.android.domain.capabilities.CapabilityRepository
 import com.owncloud.android.domain.files.FileRepository
+import com.owncloud.android.domain.members.MembersRepository
 import com.owncloud.android.domain.roles.RolesRepository
 import com.owncloud.android.domain.server.ServerInfoRepository
 import com.owncloud.android.domain.sharing.sharees.ShareeRepository
@@ -61,6 +63,7 @@ val repositoryModule = module {
     factoryOf(::OCCapabilityRepository) bind CapabilityRepository::class
     factoryOf(::OCFileRepository) bind FileRepository::class
     factoryOf(::OCFolderBackupRepository) bind FolderBackupRepository::class
+    factoryOf(::OCMembersRepository) bind MembersRepository::class
     factoryOf(::OCOAuthRepository) bind OAuthRepository::class
     factoryOf(::OCRolesRepository) bind RolesRepository::class
     factoryOf(::OCServerInfoRepository) bind ServerInfoRepository::class
diff --git a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt
index 90299a510ee..ae73313bf84 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt
@@ -7,7 +7,7 @@
  * @author Aitor Ballesteros Pavón
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -107,6 +107,7 @@ import com.owncloud.android.domain.spaces.usecases.GetSpaceWithSpecialsByIdForAc
 import com.owncloud.android.domain.spaces.usecases.GetSpacesFromEveryAccountUseCaseAsStream
 import com.owncloud.android.domain.spaces.usecases.RefreshSpacesFromServerAsyncUseCase
 import com.owncloud.android.domain.spaces.usecases.GetSpaceMembersUseCase
+import com.owncloud.android.domain.members.usecases.SearchMembersUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransferByIdUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransfersUseCase
 import com.owncloud.android.domain.transfers.usecases.GetAllTransfersAsStreamUseCase
@@ -306,4 +307,7 @@ val useCaseModule = module {
 
     // Roles
     factoryOf(::GetRolesAsyncUseCase)
+
+    // Members
+    factoryOf(::SearchMembersUseCase)
 }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt b/owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt
index 99dc525a20f..4c65b00650d 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt
@@ -31,7 +31,7 @@ fun SpaceMenuOption.toStringResId() =
         SpaceMenuOption.ENABLE -> R.string.enable_space
         SpaceMenuOption.DELETE -> R.string.delete_space
         SpaceMenuOption.SET_ICON -> R.string.set_space_icon
-        SpaceMenuOption.MEMBERS -> R.string.space_members
+        SpaceMenuOption.MEMBERS -> R.string.members_title
     }
 
 fun SpaceMenuOption.toDrawableResId() =
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt
new file mode 100644
index 00000000000..28faaf41113
--- /dev/null
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt
@@ -0,0 +1,143 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.presentation.spaces.members
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.owncloud.android.R
+import com.owncloud.android.databinding.AddMemberFragmentBinding
+import com.owncloud.android.domain.spaces.model.OCSpace
+import com.owncloud.android.domain.spaces.model.SpaceMember
+import com.owncloud.android.extensions.collectLatestLifecycleFlow
+import com.owncloud.android.extensions.showErrorInSnackbar
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import timber.log.Timber
+
+class AddMemberFragment: Fragment() {
+    private var _binding: AddMemberFragmentBinding? = null
+    private val binding get() = _binding!!
+
+    private val spaceMembersViewModel: SpaceMembersViewModel by viewModel {
+        parametersOf(
+            requireArguments().getString(ARG_ACCOUNT_NAME),
+            requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE)
+        )
+    }
+
+    private lateinit var searchMembersAdapter: SearchMembersAdapter
+    private lateinit var recyclerView: RecyclerView
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        _binding = AddMemberFragmentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        searchMembersAdapter = SearchMembersAdapter()
+        recyclerView = binding.membersRecyclerView
+        recyclerView.apply {
+            layoutManager = LinearLayoutManager(requireContext())
+            adapter = searchMembersAdapter
+        }
+
+        val spaceMembers = requireArguments().getParcelableArrayList<SpaceMember>(ARG_SPACE_MEMBERS) ?: arrayListOf()
+
+        collectLatestLifecycleFlow(spaceMembersViewModel.members) { uiState ->
+            if (uiState.isLoading) {
+                binding.indeterminateProgressBar.visibility = View.VISIBLE
+                binding.emptyDataParent.root.visibility = View.GONE
+                binding.membersRecyclerView.visibility = View.GONE
+            } else {
+                binding.indeterminateProgressBar.visibility = View.GONE
+                val listOfMembersFiltered = uiState.members.filter { member ->
+                    !spaceMembers.any { spaceMember ->
+                        spaceMember.id == "u:${member.id}" || spaceMember.id == "g:${member.id}" }
+                }
+                val hasMembers = listOfMembersFiltered.isNotEmpty()
+                showOrHideEmptyView(hasMembers)
+                if (hasMembers) searchMembersAdapter.setMembers(listOfMembersFiltered)
+                uiState.error?.let {
+                    Timber.e(uiState.error, "Failed to retrieve available users and groups")
+                    showErrorInSnackbar(R.string.members_search_failed, uiState.error)
+                }
+            }
+        }
+
+        binding.searchBar.apply {
+            requestFocus()
+            setOnQueryTextListener(object : androidx.appcompat.widget.SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean = true
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    if (newText.length > 2) { spaceMembersViewModel.searchMembers(newText) } else { spaceMembersViewModel.clearSearch() }
+                    return true
+                }
+            })
+        }
+    }
+
+    private fun showOrHideEmptyView(hasMembers: Boolean) {
+        binding.membersRecyclerView.isVisible = hasMembers
+        binding.emptyDataParent.apply {
+            val shouldShow = !hasMembers && binding.searchBar.query.length > 2
+            root.isVisible = shouldShow
+            if (shouldShow) {
+                listEmptyDatasetIcon.setImageResource(R.drawable.ic_share_generic_white)
+                listEmptyDatasetTitle.setText(R.string.members_search_failed)
+                listEmptyDatasetSubTitle.setText(R.string.members_search_empty)
+            }
+        }
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        requireActivity().setTitle(R.string.members_add)
+    }
+
+    companion object {
+        private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME"
+        private const val ARG_CURRENT_SPACE = "CURRENT_SPACE"
+        private const val ARG_SPACE_MEMBERS = "SPACE_MEMBERS"
+
+        fun newInstance(
+            accountName: String,
+            currentSpace: OCSpace,
+            spaceMembers: List<SpaceMember>
+        ): AddMemberFragment {
+            val args = Bundle().apply {
+                putString(ARG_ACCOUNT_NAME, accountName)
+                putParcelable(ARG_CURRENT_SPACE, currentSpace)
+                putParcelableArrayList(ARG_SPACE_MEMBERS, ArrayList(spaceMembers))
+            }
+            return AddMemberFragment().apply {
+                arguments = args
+            }
+        }
+    }
+}
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SearchMembersAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SearchMembersAdapter.kt
new file mode 100644
index 00000000000..5ba99307f46
--- /dev/null
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SearchMembersAdapter.kt
@@ -0,0 +1,82 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.presentation.spaces.members
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.owncloud.android.R
+import com.owncloud.android.databinding.MemberItemBinding
+import com.owncloud.android.domain.members.model.OCMember
+import com.owncloud.android.utils.PreferenceUtils
+
+class SearchMembersAdapter: RecyclerView.Adapter<SearchMembersAdapter.SearchMembersViewHolder>() {
+
+    private var members = mutableListOf<OCMember>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchMembersViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        val view = inflater.inflate(R.layout.member_item, parent, false)
+        view.filterTouchesWhenObscured = PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(parent.context)
+
+        return SearchMembersViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: SearchMembersViewHolder, position: Int) {
+        val member = members[position]
+
+        holder.binding.apply {
+            val isGroup = member.surname == GROUP_SURNAME
+            memberIcon.setImageResource(if (isGroup) R.drawable.ic_group else R.drawable.ic_user)
+            memberName.text = member.displayName
+            memberName.contentDescription = holder.itemView.context.getString(
+                if (isGroup) R.string.content_description_member_group else R.string.content_description_member_user, member.displayName
+            )
+            memberRole.text = if (isGroup) {
+                holder.itemView.context.getString(R.string.member_type_group)
+            } else {
+                if (member.surname == USER_SURNAME) holder.itemView.context.getString(R.string.member_type_user) else member.surname
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = members.size
+
+    fun setMembers(members: List<OCMember>) {
+        val diffCallback = SpaceMembersDiffUtil(this.members, members)
+        val diffResult = DiffUtil.calculateDiff(diffCallback)
+        this.members.clear()
+        this.members.addAll(members)
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    class SearchMembersViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val binding = MemberItemBinding.bind(itemView)
+    }
+
+    companion object {
+        private const val USER_SURNAME = "User"
+        private const val GROUP_SURNAME = "Group"
+    }
+}
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersActivity.kt
index 1d96476ef63..4c47841792b 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersActivity.kt
@@ -3,7 +3,7 @@
  *
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -25,21 +25,43 @@ import android.view.Menu
 import android.view.MenuItem
 import androidx.fragment.app.transaction
 import com.owncloud.android.R
+import com.owncloud.android.databinding.MembersActivityBinding
 import com.owncloud.android.domain.spaces.model.OCSpace
+import com.owncloud.android.domain.spaces.model.SpaceMember
 import com.owncloud.android.ui.activity.FileActivity
+import com.owncloud.android.utils.DisplayUtils
 
-class SpaceMembersActivity: FileActivity() {
+class SpaceMembersActivity: FileActivity(), SpaceMembersFragment.SpaceMemberFragmentListener {
+
+    private lateinit var binding: MembersActivityBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.members_activity)
+        binding = MembersActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         setupStandardToolbar(title = null, displayHomeAsUpEnabled = true, homeButtonEnabled = true, displayShowTitleEnabled = true)
 
         supportActionBar?.setHomeActionContentDescription(R.string.common_back)
 
-        val currentSpace = intent.getParcelableExtra<OCSpace>(EXTRA_SPACE)
+        val currentSpace = intent.getParcelableExtra<OCSpace>(EXTRA_SPACE) ?: return
+        binding.apply {
+            itemName.text = currentSpace.name
+            currentSpace.quota?.let { quota ->
+                val usedQuota = quota.used
+                val totalQuota = quota.total
+                itemSize.text = when {
+                    usedQuota == null -> getString(R.string.drawer_unavailable_used_storage)
+                    totalQuota == 0L -> DisplayUtils.bytesToHumanReadable(usedQuota, baseContext, true)
+                    else -> getString(
+                        R.string.drawer_quota,
+                        DisplayUtils.bytesToHumanReadable(usedQuota, baseContext, true),
+                        DisplayUtils.bytesToHumanReadable(totalQuota, baseContext, true),
+                        quota.getRelative().toString())
+                }
+            }
+        }
 
         supportFragmentManager.transaction {
             if (savedInstanceState == null && currentSpace != null) {
@@ -59,8 +81,19 @@ class SpaceMembersActivity: FileActivity() {
             super.onOptionsItemSelected(item)
         }
 
+    override fun addMember(space: OCSpace, spaceMembers: List<SpaceMember>) {
+        val addMemberFragment = AddMemberFragment.newInstance(account.name, space, spaceMembers)
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.apply {
+            replace(R.id.members_fragment_container, addMemberFragment, TAG_ADD_MEMBER_FRAGMENT)
+            addToBackStack(null)
+            commit()
+        }
+    }
+
     companion object {
         private const val TAG_SPACE_MEMBERS_FRAGMENT = "SPACE_MEMBERS_FRAGMENT"
+        private const val TAG_ADD_MEMBER_FRAGMENT ="ADD_MEMBER_FRAGMENT"
         const val EXTRA_SPACE = "EXTRA_SPACE"
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
index f33a0bf9283..d96182f3c9f 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersAdapter.kt
@@ -73,7 +73,9 @@ class SpaceMembersAdapter: RecyclerView.Adapter<SpaceMembersAdapter.SpaceMembers
 
     fun setSpaceMembers(spaceMembers: SpaceMembers, roles: List<OCRole>) {
         this.rolesMap = roles.associate { it.id to it.displayName }
-        this.members = spaceMembers.members.sortedByDescending { member -> roles.indexOfFirst { it.id in member.roles } }
+        this.members = spaceMembers.members.sortedWith(compareByDescending<SpaceMember> {
+                member -> roles.indexOfFirst { it.id in member.roles } }.thenBy { member -> member.displayName }
+        )
         notifyDataSetChanged()
     }
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersDiffUtil.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersDiffUtil.kt
new file mode 100644
index 00000000000..f200eacd186
--- /dev/null
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersDiffUtil.kt
@@ -0,0 +1,47 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.presentation.spaces.members
+
+import androidx.recyclerview.widget.DiffUtil
+import com.owncloud.android.domain.members.model.OCMember
+
+class SpaceMembersDiffUtil(
+    private val oldList: List<OCMember>,
+    private val newList: List<OCMember>
+) : DiffUtil.Callback() {
+    override fun getOldListSize(): Int = oldList.size
+
+    override fun getNewListSize(): Int = newList.size
+
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldList[oldItemPosition]
+        val newItem = newList[newItemPosition]
+
+        return oldItem.id == newItem.id
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldList[oldItemPosition]
+        val newItem = newList[newItemPosition]
+
+        return ((oldItem.id == newItem.id) && (oldItem.displayName == newItem.displayName) && (oldItem.surname == newItem.surname))
+    }
+}
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
index 00ed053774d..c5f1e00c35c 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
@@ -3,7 +3,7 @@
  *
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -20,6 +20,7 @@
 
 package com.owncloud.android.presentation.spaces.members
 
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -31,11 +32,12 @@ import com.owncloud.android.R
 import com.owncloud.android.databinding.MembersFragmentBinding
 import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.OCSpace
+import com.owncloud.android.domain.spaces.model.SpaceMember
 import com.owncloud.android.extensions.collectLatestLifecycleFlow
 import com.owncloud.android.presentation.common.UIResult
-import com.owncloud.android.utils.DisplayUtils
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
+import timber.log.Timber
 
 class SpaceMembersFragment : Fragment() {
     private var _binding: MembersFragmentBinding? = null
@@ -52,6 +54,8 @@ class SpaceMembersFragment : Fragment() {
     private lateinit var recyclerView: RecyclerView
 
     private var roles: List<OCRole> = emptyList()
+    private var spaceMembers: List<SpaceMember> = emptyList()
+    private var listener: SpaceMemberFragmentListener? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         _binding = MembersFragmentBinding.inflate(inflater, container, false)
@@ -67,6 +71,8 @@ class SpaceMembersFragment : Fragment() {
             adapter = spaceMembersAdapter
         }
 
+        val currentSpace = requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE) ?: return
+
         collectLatestLifecycleFlow(spaceMembersViewModel.roles) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
@@ -77,7 +83,9 @@ class SpaceMembersFragment : Fragment() {
                         }
                     }
                     is UIResult.Loading -> { }
-                    is UIResult.Error -> { }
+                    is UIResult.Error -> {
+                        Timber.e(uiResult.error, "Failed to retrieve platform roles")
+                    }
                 }
             }
         }
@@ -87,37 +95,64 @@ class SpaceMembersFragment : Fragment() {
                 when (val uiResult = event.peekContent()) {
                     is UIResult.Success -> {
                         uiResult.data?.let {
-                            if (roles.isNotEmpty()) { spaceMembersAdapter.setSpaceMembers(it, roles) }
+                            if (roles.isNotEmpty()) {
+                                spaceMembersAdapter.setSpaceMembers(it, roles)
+                                spaceMembers = it.members
+                            }
                         }
                     }
                     is UIResult.Loading -> { }
-                    is UIResult.Error -> { }
+                    is UIResult.Error -> {
+                        Timber.e(uiResult.error, "Failed to retrieve space members for space: ${currentSpace.id} (${currentSpace?.id})")
+                    }
                 }
             }
         }
 
-        val currentSpace = requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE) ?: return
-        binding.apply {
-            itemName.text = currentSpace.name
-            currentSpace.quota?.let { quota ->
-                val usedQuota = quota.used
-                val totalQuota = quota.total
-                itemSize.text = when {
-                    usedQuota == null -> getString(R.string.drawer_unavailable_used_storage)
-                    totalQuota == 0L -> DisplayUtils.bytesToHumanReadable(usedQuota, requireContext(), true)
-                    else -> getString(
-                        R.string.drawer_quota,
-                        DisplayUtils.bytesToHumanReadable(usedQuota, requireContext(), true),
-                        DisplayUtils.bytesToHumanReadable(totalQuota, requireContext(), true),
-                        quota.getRelative().toString())
+        collectLatestLifecycleFlow(spaceMembersViewModel.spacePermissions) { event ->
+            event?.let {
+                when (val uiResult = event.peekContent()) {
+                    is UIResult.Success -> {
+                        uiResult.data?.let { spacePermissions ->
+                            if (DRIVES_CREATE_PERMISSION in spacePermissions) { binding.addMemberButton.visibility = View.VISIBLE }
+                        }
+                    }
+                    is UIResult.Loading -> { }
+                    is UIResult.Error -> {
+                        Timber.e(uiResult.error, "Failed to retrieve space permissions for space: ${currentSpace.id} (${currentSpace?.id})")
+                    }
                 }
             }
         }
+
+        binding.addMemberButton.setOnClickListener {
+            listener?.addMember(currentSpace, spaceMembers)
+        }
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        requireActivity().setTitle(R.string.space_members_label)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        try {
+            listener = context as SpaceMemberFragmentListener?
+        } catch (e: ClassCastException) {
+            Timber.e(e, "The activity attached does not implement SpaceMemberFragmentListener")
+            throw ClassCastException(activity.toString() + " must implement SpaceMemberFragmentListener")
+        }
+    }
+
+    interface SpaceMemberFragmentListener {
+        fun addMember(space: OCSpace, spaceMembers: List<SpaceMember>)
     }
 
     companion object {
         private const val ARG_CURRENT_SPACE = "CURRENT_SPACE"
         private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME"
+        private const val DRIVES_CREATE_PERMISSION = "libre.graph/driveItem/permissions/create"
 
         fun newInstance(
             accountName: String,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt
index 72b4fa673fb..632f11e7f23 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt
@@ -3,7 +3,7 @@
  *
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -21,21 +21,32 @@
 package com.owncloud.android.presentation.spaces.members
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.owncloud.android.domain.UseCaseResult
+import com.owncloud.android.domain.members.model.OCMember
 import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.OCSpace
 import com.owncloud.android.domain.spaces.model.SpaceMembers
 import com.owncloud.android.domain.spaces.usecases.GetSpaceMembersUseCase
 import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
+import com.owncloud.android.domain.spaces.usecases.GetSpacePermissionsAsyncUseCase
+import com.owncloud.android.domain.members.usecases.SearchMembersUseCase
 import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 
 class SpaceMembersViewModel(
     private val getRolesAsyncUseCase: GetRolesAsyncUseCase,
     private val getSpaceMembersUseCase: GetSpaceMembersUseCase,
+    private val getSpacePermissionsAsyncUseCase: GetSpacePermissionsAsyncUseCase,
+    private val searchMembersUseCase: SearchMembersUseCase,
     private val accountName: String,
     private val space: OCSpace,
     private val coroutineDispatcherProvider: CoroutinesDispatcherProvider
@@ -47,6 +58,14 @@ class SpaceMembersViewModel(
     private val _spaceMembers = MutableStateFlow<Event<UIResult<SpaceMembers>>?>(null)
     val spaceMembers: StateFlow<Event<UIResult<SpaceMembers>>?> = _spaceMembers
 
+    private val _spacePermissions = MutableStateFlow<Event<UIResult<List<String>>>?>(null)
+    val spacePermissions: StateFlow<Event<UIResult<List<String>>>?> = _spacePermissions
+
+    private val _members: MutableSharedFlow<MembersUIState> = MutableSharedFlow()
+    val members: SharedFlow<MembersUIState> = _members
+
+    private var searchJob: Job? = null
+
     init {
         runUseCaseWithResult(
             coroutineDispatcher = coroutineDispatcherProvider.io,
@@ -56,6 +75,16 @@ class SpaceMembersViewModel(
             showLoading = false,
             requiresConnection = true
         )
+
+        runUseCaseWithResult(
+            coroutineDispatcher = coroutineDispatcherProvider.io,
+            flow = _spacePermissions,
+            useCase = getSpacePermissionsAsyncUseCase,
+            useCaseParams = GetSpacePermissionsAsyncUseCase.Params(accountName = accountName, spaceId = space.id),
+            showLoading = false,
+            requiresConnection = true
+        )
+
     }
 
     fun getSpaceMembers() = runUseCaseWithResult(
@@ -67,4 +96,26 @@ class SpaceMembersViewModel(
         requiresConnection = true
     )
 
+    fun searchMembers(query: String) {
+        searchJob?.cancel()
+        searchJob = viewModelScope.launch(coroutineDispatcherProvider.io) {
+            _members.emit(MembersUIState(members = emptyList(), isLoading = true , error = null))
+            when (val result = searchMembersUseCase(SearchMembersUseCase.Params(accountName, query))) {
+                is UseCaseResult.Success -> _members.emit(MembersUIState(members = result.data, isLoading = false, error = null))
+                is UseCaseResult.Error -> _members.emit(MembersUIState(members = emptyList(), isLoading = false, error = result.getThrowableOrNull()))
+            }
+        }
+    }
+
+    fun clearSearch() {
+        viewModelScope.launch(coroutineDispatcherProvider.io) {
+            _members.emit(MembersUIState(members = emptyList(), isLoading = false , error = null))
+        }
+    }
+
+    data class MembersUIState (
+        val members: List<OCMember>,
+        val isLoading: Boolean,
+        val error: Throwable?
+    )
 }
diff --git a/owncloudApp/src/main/res/layout/add_member_fragment.xml b/owncloudApp/src/main/res/layout/add_member_fragment.xml
new file mode 100644
index 00000000000..c03bd6e40b4
--- /dev/null
+++ b/owncloudApp/src/main/res/layout/add_member_fragment.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ownCloud Android client application
+
+  Copyright (C) 2026 ownCloud GmbH.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/shareScroll"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:id="@+id/search_member_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/standard_half_margin"
+        android:minWidth="@dimen/share_user_groups_width"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/search_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:queryHint="@string/search_users_and_groups_hint"
+            app:iconifiedByDefault="false"/>
+
+        <ProgressBar
+            android:id="@+id/indeterminate_progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/members_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:scrollbars="vertical"
+            android:visibility="visible" />
+
+        <include
+            android:id="@+id/empty_data_parent"
+            layout="@layout/item_empty_dataset"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/owncloudApp/src/main/res/layout/member_item.xml b/owncloudApp/src/main/res/layout/member_item.xml
index ab5f52997ee..c23fa978ec3 100644
--- a/owncloudApp/src/main/res/layout/member_item.xml
+++ b/owncloudApp/src/main/res/layout/member_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
 
-  Copyright (C) 2025 ownCloud GmbH.
+  Copyright (C) 2026 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -70,7 +70,9 @@
                     android:layout_marginBottom="@dimen/standard_half_margin"
                     android:text="@string/placeholder_sentence"
                     android:textSize="13sp"
-                    android:textColor="@color/textColor"/>
+                    android:textColor="@color/textColor"
+                    android:ellipsize="middle"
+                    android:maxLines="1"/>
 
                 <ImageView
                     android:id="@+id/expiration_calendar_icon"
diff --git a/owncloudApp/src/main/res/layout/members_activity.xml b/owncloudApp/src/main/res/layout/members_activity.xml
index dae7364c3da..d3dab222dc5 100644
--- a/owncloudApp/src/main/res/layout/members_activity.xml
+++ b/owncloudApp/src/main/res/layout/members_activity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
 
-  Copyright (C) 2025 ownCloud GmbH.
+  Copyright (C) 2026 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -16,8 +16,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/members_activity_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,6 +26,49 @@
 
     <include layout="@layout/owncloud_toolbar" />
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/item_header_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/standard_padding">
+
+        <ImageView
+            android:id="@+id/item_icon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/ic_menu_space"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <TextView
+            android:id="@+id/item_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/standard_half_margin"
+            android:layout_marginStart="@dimen/standard_half_margin"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:text="@string/placeholder_filename"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintStart_toEndOf="@id/item_icon"
+            app:layout_constraintTop_toTopOf="parent"/>
+
+        <TextView
+            android:id="@+id/item_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/standard_half_margin"
+            android:text="@string/placeholder_filesize"
+            android:textColor="@color/list_item_lastmod_and_filesize_text"
+            android:textSize="14sp"
+            app:layout_constraintStart_toEndOf="@id/item_icon"
+            app:layout_constraintTop_toBottomOf="@id/item_name"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/owncloudApp/src/main/res/layout/members_fragment.xml b/owncloudApp/src/main/res/layout/members_fragment.xml
index f1fe488b450..7413c02d29d 100644
--- a/owncloudApp/src/main/res/layout/members_fragment.xml
+++ b/owncloudApp/src/main/res/layout/members_fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ownCloud Android client application
 
-  Copyright (C) 2025 ownCloud GmbH.
+  Copyright (C) 2026 ownCloud GmbH.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -25,91 +25,56 @@
     tools:context=".presentation.spaces.members.SpaceMembersActivity">
 
     <LinearLayout
+        android:id="@+id/members_section"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/item_header_container"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/standard_padding">
-
-            <ImageView
-                android:id="@+id/item_icon"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_menu_space"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+            android:layout_height="match_parent"
+            android:background="@color/actionbar_start_color">
 
             <TextView
-                android:id="@+id/item_name"
+                android:id="@+id/members_title"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/standard_half_margin"
+                android:layout_height="50dp"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:text="@string/members_title"
                 android:layout_marginStart="@dimen/standard_half_margin"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:text="@string/placeholder_filename"
-                android:textColor="@color/black"
-                android:textSize="16sp"
-                app:layout_constraintStart_toEndOf="@id/item_icon"
+                android:textAllCaps="true"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:accessibilityHeading="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
 
-            <TextView
-                android:id="@+id/item_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/standard_half_margin"
-                android:text="@string/placeholder_filesize"
-                android:textColor="@color/list_item_lastmod_and_filesize_text"
-                android:textSize="14sp"
-                app:layout_constraintStart_toEndOf="@id/item_icon"
-                app:layout_constraintTop_toBottomOf="@+id/item_name"/>
+            <ImageButton
+                android:id="@+id/add_member_button"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:padding="@dimen/standard_padding"
+                android:background="@color/transparent"
+                android:src="@drawable/ic_add"
+                android:contentDescription="@string/content_description_add_member"
+                android:visibility="gone"
+                android:focusable="true"
+                android:clickable="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <LinearLayout
-            android:id="@+id/members_section"
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/members_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/actionbar_start_color">
-
-                <TextView
-                    android:id="@+id/members_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50dp"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/space_members"
-                    android:layout_marginStart="@dimen/standard_half_margin"
-                    android:textAllCaps="true"
-                    android:textColor="@color/white"
-                    android:textStyle="bold"
-                    android:accessibilityHeading="true"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"/>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/members_recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:scrollbars="vertical"
-                android:visibility="visible"
-                tools:visibility="visible"/>
-
-        </LinearLayout>
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:scrollbars="vertical"
+            android:visibility="visible"
+            tools:visibility="visible"/>
 
     </LinearLayout>
 
diff --git a/owncloudApp/src/main/res/values/strings.xml b/owncloudApp/src/main/res/values/strings.xml
index 65b80872878..7497bef1bb1 100644
--- a/owncloudApp/src/main/res/values/strings.xml
+++ b/owncloudApp/src/main/res/values/strings.xml
@@ -830,6 +830,7 @@
     <string name="content_description_member_user">User %1$s</string>
     <string name="content_description_member_group">Group %1$s</string>
     <string name="content_description_member_expiration_date">Expires %1$s</string>
+    <string name="content_description_add_member">Add new member</string>
 
     <string name="create_shortcut_dialog_title">Create a shortcut</string>
     <string name="create_shortcut_dialog_url">URL</string>
@@ -876,7 +877,12 @@
     <string name="delete_space_correctly">Space deleted correctly</string>
     <string name="delete_space_failed">Space could not be deleted</string>
     <string name="set_space_icon">Set icon</string>
-    <string name="space_members">Members</string>
+    <string name="members_title">Members</string>
+    <string name="members_add">Add member</string>
+    <string name="members_search_failed">No results found</string>
+    <string name="members_search_empty">No user or groups matches your search</string>
+    <string name="member_type_user">User</string>
+    <string name="member_type_group">Group</string>
 
     <string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
 
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/SearchRemoteMembersOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/SearchRemoteMembersOperation.kt
new file mode 100644
index 00000000000..579e0dd350e
--- /dev/null
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/SearchRemoteMembersOperation.kt
@@ -0,0 +1,85 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.members
+
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.http.HttpConstants
+import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod
+import com.owncloud.android.lib.common.operations.RemoteOperation
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode
+import com.owncloud.android.lib.resources.members.responses.MemberResponse
+import com.owncloud.android.lib.resources.members.responses.MembersResponseWrapper
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import timber.log.Timber
+import java.net.URL
+
+class SearchRemoteMembersOperation(
+    private val query: String,
+    private val searchGroups: Boolean
+): RemoteOperation<List<MemberResponse>>() {
+    override fun run(client: OwnCloudClient): RemoteOperationResult<List<MemberResponse>> {
+        var result: RemoteOperationResult<List<MemberResponse>>
+        try {
+            val moshi = Moshi.Builder().build()
+
+            val uriBuilder = client.baseUri.buildUpon().apply {
+                appendEncodedPath(if (searchGroups) GRAPH_API_GROUPS_PATH else GRAPH_API_USERS_PATH)
+                appendQueryParameter(SEARCH_QUERY, "\"$query\"")
+                appendQueryParameter(ORDER_BY_QUERY, ORDER_BY_QUERY_VALUE)
+            }
+
+            val getMethod = GetMethod(URL(uriBuilder.build().toString()))
+
+            val status = client.executeHttpMethod(getMethod)
+
+            val response = getMethod.getResponseBodyAsString()
+
+            if (status == HttpConstants.HTTP_OK) {
+                Timber.d("Successful response: $response")
+
+                val responseAdapter: JsonAdapter<MembersResponseWrapper> = moshi.adapter(MembersResponseWrapper::class.java)
+
+                result = RemoteOperationResult(ResultCode.OK)
+                result.data = responseAdapter.fromJson(response)?.value
+
+                Timber.d("Get all available users and groups completed and parsed to ${result.data}")
+            } else {
+                result = RemoteOperationResult(getMethod)
+                Timber.e("Failed response while getting the users and groups; status code: $status, response: $response")
+            }
+        } catch (e: Exception) {
+            result = RemoteOperationResult(e)
+            Timber.e(e, "Exception while getting the users and groups")
+        }
+        return result
+    }
+
+    companion object {
+        private const val GRAPH_API_USERS_PATH = "graph/v1.0/users"
+        private const val GRAPH_API_GROUPS_PATH = "graph/v1.0/groups"
+        private const val SEARCH_QUERY = "\$search"
+        private const val ORDER_BY_QUERY = "\$orderby"
+        private const val ORDER_BY_QUERY_VALUE = "displayName"
+    }
+
+}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/responses/MembersResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/responses/MembersResponse.kt
new file mode 100644
index 00000000000..90cfde872ed
--- /dev/null
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/responses/MembersResponse.kt
@@ -0,0 +1,35 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.members.responses
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class MembersResponseWrapper(
+    val value: List<MemberResponse>
+)
+
+@JsonClass(generateAdapter = true)
+data class MemberResponse(
+    val id: String,
+    val displayName: String,
+    val surname: String?
+)
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/MembersService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/MembersService.kt
new file mode 100644
index 00000000000..340ade1b6b3
--- /dev/null
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/MembersService.kt
@@ -0,0 +1,30 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.members.services
+
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.resources.Service
+import com.owncloud.android.lib.resources.members.responses.MemberResponse
+
+interface MembersService: Service {
+    fun searchGroups(query: String): RemoteOperationResult<List<MemberResponse>>
+    fun searchUsers(query: String): RemoteOperationResult<List<MemberResponse>>
+}
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/OCMembersService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/OCMembersService.kt
new file mode 100644
index 00000000000..d55b96251eb
--- /dev/null
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/members/services/OCMembersService.kt
@@ -0,0 +1,35 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.lib.resources.members.services
+
+import com.owncloud.android.lib.common.OwnCloudClient
+import com.owncloud.android.lib.common.operations.RemoteOperationResult
+import com.owncloud.android.lib.resources.members.SearchRemoteMembersOperation
+import com.owncloud.android.lib.resources.members.responses.MemberResponse
+
+class OCMembersService(override val client: OwnCloudClient) : MembersService {
+    override fun searchGroups(query: String): RemoteOperationResult<List<MemberResponse>> =
+        SearchRemoteMembersOperation(query, true).execute(client)
+
+    override fun searchUsers(query: String): RemoteOperationResult<List<MemberResponse>> =
+        SearchRemoteMembersOperation(query, false).execute(client)
+
+}
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/ClientManager.kt b/owncloudData/src/main/java/com/owncloud/android/data/ClientManager.kt
index 4beabc1656d..b4681c050c8 100644
--- a/owncloudData/src/main/java/com/owncloud/android/data/ClientManager.kt
+++ b/owncloudData/src/main/java/com/owncloud/android/data/ClientManager.kt
@@ -4,7 +4,7 @@
  * @author Abel García de Prada
  * @author Jorge Aguado Recio
  *
- * Copyright (C) 2025 ownCloud GmbH.
+ * Copyright (C) 2026 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -36,6 +36,8 @@ import com.owncloud.android.lib.resources.appregistry.services.AppRegistryServic
 import com.owncloud.android.lib.resources.appregistry.services.OCAppRegistryService
 import com.owncloud.android.lib.resources.files.services.FileService
 import com.owncloud.android.lib.resources.files.services.implementation.OCFileService
+import com.owncloud.android.lib.resources.members.services.MembersService
+import com.owncloud.android.lib.resources.members.services.OCMembersService
 import com.owncloud.android.lib.resources.roles.services.OCRolesService
 import com.owncloud.android.lib.resources.roles.services.RolesService
 import com.owncloud.android.lib.resources.shares.services.ShareService
@@ -169,4 +171,9 @@ class ClientManager(
         val ownCloudClient = getClientForAccount(accountName)
         return OCRolesService(client = ownCloudClient)
     }
+
+    fun getMembersService(accountName: String): MembersService {
+        val ownCloudClient = getClientForAccount(accountName)
+        return OCMembersService(client = ownCloudClient)
+    }
 }
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/RemoteMembersDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/RemoteMembersDataSource.kt
new file mode 100644
index 00000000000..d04e8e35a77
--- /dev/null
+++ b/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/RemoteMembersDataSource.kt
@@ -0,0 +1,28 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.data.members.datasources
+
+import com.owncloud.android.domain.members.model.OCMember
+
+interface RemoteMembersDataSource {
+    fun searchGroups(accountName: String, query: String): List<OCMember>
+    fun searchUsers(accountName: String, query: String): List<OCMember>
+}
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSource.kt b/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSource.kt
new file mode 100644
index 00000000000..03373c3feb0
--- /dev/null
+++ b/owncloudData/src/main/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSource.kt
@@ -0,0 +1,55 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.data.members.datasources.implementation
+
+import androidx.annotation.VisibleForTesting
+import com.owncloud.android.data.ClientManager
+import com.owncloud.android.data.executeRemoteOperation
+import com.owncloud.android.data.members.datasources.RemoteMembersDataSource
+import com.owncloud.android.domain.members.model.OCMember
+import com.owncloud.android.lib.resources.members.responses.MemberResponse
+
+class OCRemoteMembersDataSource (
+    private val clientManager: ClientManager
+): RemoteMembersDataSource {
+    override fun searchGroups(accountName: String, query: String): List<OCMember> {
+        val groupsResponse = executeRemoteOperation { clientManager.getMembersService(accountName).searchGroups(query) }
+        return groupsResponse.map { it.toModel(isGroup = true) }
+    }
+
+    override fun searchUsers(accountName: String, query: String): List<OCMember> {
+        val usersResponse = executeRemoteOperation { clientManager.getMembersService(accountName).searchUsers(query) }
+        return usersResponse.map { it.toModel(isGroup = false) }
+    }
+
+    companion object {
+        private const val USER_SURNAME = "User"
+        private const val GROUP_SURNAME = "Group"
+
+        @VisibleForTesting
+        fun MemberResponse.toModel(isGroup: Boolean): OCMember =
+            OCMember(
+                id = id,
+                displayName = displayName,
+                surname = surname ?: if (isGroup) GROUP_SURNAME else USER_SURNAME
+            )
+    }
+}
diff --git a/owncloudData/src/main/java/com/owncloud/android/data/members/repository/OCMembersRepository.kt b/owncloudData/src/main/java/com/owncloud/android/data/members/repository/OCMembersRepository.kt
new file mode 100644
index 00000000000..0629b31384f
--- /dev/null
+++ b/owncloudData/src/main/java/com/owncloud/android/data/members/repository/OCMembersRepository.kt
@@ -0,0 +1,33 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.data.members.repository
+
+import com.owncloud.android.data.members.datasources.RemoteMembersDataSource
+import com.owncloud.android.domain.members.MembersRepository
+import com.owncloud.android.domain.members.model.OCMember
+
+class OCMembersRepository(
+    private val remoteMembersDataSource: RemoteMembersDataSource
+): MembersRepository {
+
+    override fun searchMembers(accountName: String, query: String): List<OCMember> =
+        remoteMembersDataSource.searchUsers(accountName, query) + remoteMembersDataSource.searchGroups(accountName, query)
+}
diff --git a/owncloudData/src/test/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSourceTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSourceTest.kt
new file mode 100644
index 00000000000..d6157a244b4
--- /dev/null
+++ b/owncloudData/src/test/java/com/owncloud/android/data/members/datasources/implementation/OCRemoteMembersDataSourceTest.kt
@@ -0,0 +1,87 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package com.owncloud.android.data.members.datasources.implementation
+
+import com.owncloud.android.data.ClientManager
+import com.owncloud.android.data.members.datasources.RemoteMembersDataSource
+import com.owncloud.android.data.members.datasources.implementation.OCRemoteMembersDataSource.Companion.toModel
+import com.owncloud.android.lib.resources.members.services.OCMembersService
+import com.owncloud.android.testutil.GROUP_MEMBER_RESPONSE
+import com.owncloud.android.testutil.OC_ACCOUNT_NAME
+import com.owncloud.android.testutil.USER_MEMBER_RESPONSE
+import com.owncloud.android.utils.createRemoteOperationResultMock
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import junit.framework.TestCase.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class OCRemoteMembersDataSourceTest {
+
+    private lateinit var ocRemoteMembersDataSource: RemoteMembersDataSource
+
+    private val ocMembersService: OCMembersService = mockk()
+    private val clientManager: ClientManager = mockk(relaxed = true)
+
+    private val query = "dev"
+
+    @Before
+    fun setUp() {
+        ocRemoteMembersDataSource = OCRemoteMembersDataSource(clientManager)
+        every { clientManager.getMembersService(OC_ACCOUNT_NAME) } returns ocMembersService
+    }
+
+    @Test
+    fun `searchGroups returns a list with all available groups from the server`() {
+        val searchGroupsResult = createRemoteOperationResultMock(listOf(GROUP_MEMBER_RESPONSE), isSuccess = true)
+
+        every {
+            ocMembersService.searchGroups(query)
+        } returns searchGroupsResult
+
+        val groups = ocRemoteMembersDataSource.searchGroups(OC_ACCOUNT_NAME, query)
+        assertEquals(listOf(GROUP_MEMBER_RESPONSE).map { it.toModel(isGroup = true) }, groups)
+
+        verify(exactly = 1) {
+            clientManager.getMembersService(OC_ACCOUNT_NAME)
+            ocMembersService.searchGroups(query)
+        }
+    }
+
+    @Test
+    fun `searchUsers returns a list with all available users from the server`() {
+        val searchUsersResult = createRemoteOperationResultMock(listOf(USER_MEMBER_RESPONSE), isSuccess = true)
+
+        every {
+            ocMembersService.searchUsers(query)
+        } returns searchUsersResult
+
+        val users = ocRemoteMembersDataSource.searchUsers(OC_ACCOUNT_NAME, query)
+        assertEquals(listOf(USER_MEMBER_RESPONSE).map { it.toModel(isGroup = false) }, users)
+
+        verify(exactly = 1) {
+            clientManager.getMembersService(OC_ACCOUNT_NAME)
+            ocMembersService.searchUsers(query)
+        }
+    }
+}
diff --git a/owncloudData/src/test/java/com/owncloud/android/data/members/repository/OCMembersRepositoryTest.kt b/owncloudData/src/test/java/com/owncloud/android/data/members/repository/OCMembersRepositoryTest.kt
new file mode 100644
index 00000000000..24594c40e19
--- /dev/null
+++ b/owncloudData/src/test/java/com/owncloud/android/data/members/repository/OCMembersRepositoryTest.kt
@@ -0,0 +1,58 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.data.members.repository
+
+import com.owncloud.android.data.members.datasources.RemoteMembersDataSource
+import com.owncloud.android.testutil.OC_ACCOUNT_NAME
+import com.owncloud.android.testutil.OC_GROUP_MEMBER
+import com.owncloud.android.testutil.OC_USER_MEMBER
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+
+class OCMembersRepositoryTest {
+
+    private val remoteMembersDataSource = mockk<RemoteMembersDataSource>()
+    private val ocMembersRepository = OCMembersRepository(remoteMembersDataSource)
+
+    private val query = "dev"
+
+    @Test
+    fun `searchMembers returns a list of OCMember`() {
+        every {
+            remoteMembersDataSource.searchUsers(OC_ACCOUNT_NAME, query)
+        } returns listOf(OC_USER_MEMBER)
+
+        every {
+            remoteMembersDataSource.searchGroups(OC_ACCOUNT_NAME, query)
+        } returns listOf(OC_GROUP_MEMBER)
+
+        val listOfMembers = ocMembersRepository.searchMembers(OC_ACCOUNT_NAME, query)
+        assertEquals(listOf(OC_USER_MEMBER, OC_GROUP_MEMBER), listOfMembers)
+
+        verify(exactly = 1) {
+            remoteMembersDataSource.searchUsers(OC_ACCOUNT_NAME, query)
+            remoteMembersDataSource.searchGroups(OC_ACCOUNT_NAME, query)
+        }
+    }
+}
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/members/MembersRepository.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/MembersRepository.kt
new file mode 100644
index 00000000000..136a9debcf8
--- /dev/null
+++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/MembersRepository.kt
@@ -0,0 +1,27 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.domain.members
+
+import com.owncloud.android.domain.members.model.OCMember
+
+interface MembersRepository {
+    fun searchMembers(accountName: String, query: String): List<OCMember>
+}
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/members/model/OCMember.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/model/OCMember.kt
new file mode 100644
index 00000000000..5e6976be0a4
--- /dev/null
+++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/model/OCMember.kt
@@ -0,0 +1,27 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.domain.members.model
+
+data class OCMember(
+    val id: String,
+    val displayName: String,
+    val surname: String
+)
diff --git a/owncloudDomain/src/main/java/com/owncloud/android/domain/members/usecases/SearchMembersUseCase.kt b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/usecases/SearchMembersUseCase.kt
new file mode 100644
index 00000000000..95e55e363c5
--- /dev/null
+++ b/owncloudDomain/src/main/java/com/owncloud/android/domain/members/usecases/SearchMembersUseCase.kt
@@ -0,0 +1,34 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.domain.members.usecases
+
+import com.owncloud.android.domain.BaseUseCaseWithResult
+import com.owncloud.android.domain.members.MembersRepository
+import com.owncloud.android.domain.members.model.OCMember
+
+class SearchMembersUseCase(
+    private val membersRepository: MembersRepository
+): BaseUseCaseWithResult<List<OCMember>, SearchMembersUseCase.Params>() {
+
+    override fun run(params: Params): List<OCMember> = membersRepository.searchMembers(params.accountName, params.query)
+
+    data class Params(val accountName: String, val query: String)
+}
diff --git a/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCMember.kt b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCMember.kt
new file mode 100644
index 00000000000..427f6152b0c
--- /dev/null
+++ b/owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCMember.kt
@@ -0,0 +1,48 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2026 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.owncloud.android.testutil
+
+import com.owncloud.android.domain.members.model.OCMember
+import com.owncloud.android.lib.resources.members.responses.MemberResponse
+
+val OC_USER_MEMBER = OCMember(
+    id = "a9F3kL2mP7Qx",
+    displayName = "ownCloud Developer",
+    surname = "ownCloudDeveloper"
+)
+
+val OC_GROUP_MEMBER = OCMember(
+    id = "G7pQ2M9xL4A8",
+    displayName = "ownCloud Developers",
+    surname = "Group"
+)
+
+val USER_MEMBER_RESPONSE = MemberResponse(
+    id = "a9F3kL2mP7Qx",
+    displayName = "ownCloud Developer",
+    surname = "ownCloudDeveloper"
+)
+
+val GROUP_MEMBER_RESPONSE = MemberResponse(
+    id = "G7pQ2M9xL4A8",
+    displayName = "ownCloud Developers",
+    surname = null
+)