diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index d87af9e20..73a8954c5 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -43,7 +43,7 @@ import com.nextcloud.talk.controllers.base.BaseController
import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
import com.nextcloud.talk.newarch.features.account.serverentry.ServerEntryView
-import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
+import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.utils.ConductorRemapping
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index 698265701..f50276d32 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -66,7 +66,7 @@ import com.nextcloud.talk.models.json.converters.EnumNotificationLevelConverter
import com.nextcloud.talk.models.json.generic.GenericOverall
import com.nextcloud.talk.models.json.participants.Participant
import com.nextcloud.talk.models.json.participants.ParticipantsOverall
-import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
+import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.local.models.UserNgEntity
import com.nextcloud.talk.newarch.local.models.getCredentials
import com.nextcloud.talk.newarch.utils.Images
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactPresenter.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactPresenter.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactPresenter.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactPresenter.kt
index b91a770d0..0e57f5eb2 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactPresenter.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactPresenter.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import android.view.ViewGroup
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsUtils.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsUtils.kt
similarity index 93%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsUtils.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsUtils.kt
index 41141e6d8..84a4af327 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsUtils.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
enum class ParticipantElementType {
PARTICIPANT,
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsView.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsView.kt
index c0f9770c3..90ea4cfae 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsView.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import android.os.Bundle
@@ -31,8 +31,6 @@ import androidx.core.view.isVisible
import androidx.lifecycle.observe
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import com.bluelinelabs.conductor.ControllerChangeHandler
-import com.bluelinelabs.conductor.ControllerChangeType
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewFooterSource.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewFooterSource.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewFooterSource.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewFooterSource.kt
index 2af60de9f..7272006be 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewFooterSource.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewFooterSource.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import com.nextcloud.talk.R
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewHeaderSource.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewHeaderSource.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewHeaderSource.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewHeaderSource.kt
index 8fa39974c..c8295b251 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewHeaderSource.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewHeaderSource.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.content.Context
import com.nextcloud.talk.R
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModel.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt
index d29a96cb0..31e661f70 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.app.Application
import androidx.lifecycle.LiveData
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModelFactory.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModelFactory.kt
similarity index 96%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModelFactory.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModelFactory.kt
index 7605dcc63..9301cdad9 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewModelFactory.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModelFactory.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import android.app.Application
import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewOperationState.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewOperationState.kt
similarity index 92%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewOperationState.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewOperationState.kt
index 45f2aabf2..9d2de4b94 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewOperationState.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewOperationState.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import kotlinx.serialization.Serializable
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewSource.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewSource.kt
similarity index 96%
rename from app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewSource.kt
rename to app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewSource.kt
index f3bf8889b..6be96c740 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsViewSource.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewSource.kt
@@ -20,7 +20,7 @@
*
*/
-package com.nextcloud.talk.newarch.features.contactsflow
+package com.nextcloud.talk.newarch.features.contactsflow.contacts
import androidx.lifecycle.LiveData
import com.nextcloud.talk.models.json.participants.Participant
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/di/module/ContactsFlowModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/di/module/ContactsFlowModule.kt
index 0fae553a7..12ae65090 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/di/module/ContactsFlowModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/di/module/ContactsFlowModule.kt
@@ -26,7 +26,7 @@ import android.app.Application
import com.nextcloud.talk.newarch.domain.usecases.AddParticipantToConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.CreateConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.GetContactsUseCase
-import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewModelFactory
+import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsViewModelFactory
import com.nextcloud.talk.newarch.services.GlobalService
import org.koin.android.ext.koin.androidApplication
import org.koin.dsl.module
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/source/FixedListSource.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/source/FixedListSource.kt
index 4a958f0da..e2f95406e 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/source/FixedListSource.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/source/FixedListSource.kt
@@ -22,7 +22,7 @@
package com.nextcloud.talk.newarch.features.contactsflow.source
-import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewSource
+import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsViewSource
import com.otaliastudios.elements.Source
import com.otaliastudios.elements.extensions.ListSource
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
index 038724433..843093976 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
@@ -47,7 +47,7 @@ import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage
import com.nextcloud.talk.controllers.bottomsheet.items.listItemsWithImage
import com.nextcloud.talk.models.json.conversations.Conversation
import com.nextcloud.talk.newarch.data.presenters.AdvancedEmptyPresenter
-import com.nextcloud.talk.newarch.features.contactsflow.ContactsView
+import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView
import com.nextcloud.talk.newarch.features.search.DebouncingTextWatcher
import com.nextcloud.talk.newarch.mvvm.BaseView
import com.nextcloud.talk.newarch.mvvm.ext.initRecyclerView
@@ -63,7 +63,6 @@ import com.uber.autodispose.lifecycle.LifecycleScopeProvider
import kotlinx.android.synthetic.main.conversations_list_view.view.*
import kotlinx.android.synthetic.main.message_state.view.*
import kotlinx.android.synthetic.main.search_layout.*
-import kotlinx.android.synthetic.main.search_layout.view.*
import org.koin.android.ext.android.inject
import org.parceler.Parcels
diff --git a/app/src/main/res/layout/new_group_conversation_view.xml b/app/src/main/res/layout/new_group_conversation_view.xml
new file mode 100644
index 000000000..96a27858e
--- /dev/null
+++ b/app/src/main/res/layout/new_group_conversation_view.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19b0d3c72..55f2441bb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -134,6 +134,7 @@
No proxy
Username
Password
+ Password (Optional)
Redacted for privacy reasons
Conversation link
New password