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 d88f4178f..0828b475f 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -186,12 +186,10 @@ class MainActivity : BaseActivity(), ActionBarProvider {
         val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(ApiUtils.API_V4, 1))
         val credentials = ApiUtils.getCredentials(currentUser?.username, currentUser?.token)
         val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            currentUser?.baseUrl!!,
-            roomType,
-            null,
-            userId,
-            null
+            version = apiVersion,
+            baseUrl = currentUser?.baseUrl!!,
+            roomType = roomType,
+            invite = userId
         )
 
         ncApi.createRoom(
diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 0e182dc1a..5ab8a75ab 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -3168,12 +3168,10 @@ class ChatActivity :
         val apiVersion =
             ApiUtils.getConversationApiVersion(conversationUser!!, intArrayOf(ApiUtils.API_V4, 1))
         val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            conversationUser?.baseUrl!!,
-            "1",
-            null,
-            message?.user?.id?.substring(INVITE_LENGTH),
-            null
+            version = apiVersion,
+            baseUrl = conversationUser?.baseUrl!!,
+            roomType = "1",
+            invite = message?.user?.id?.substring(INVITE_LENGTH)
         )
         chatViewModel.createRoom(
             credentials!!,
@@ -3601,12 +3599,10 @@ class ChatActivity :
             }
 
             val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-                apiVersion,
-                conversationUser?.baseUrl!!,
-                "1",
-                null,
-                userMentionClickEvent.userId,
-                null
+                version = apiVersion,
+                baseUrl = conversationUser?.baseUrl!!,
+                roomType = "1",
+                invite = userMentionClickEvent.userId
             )
 
             chatViewModel.createRoom(
@@ -3713,12 +3709,11 @@ class ChatActivity :
         val apiVersion =
             ApiUtils.getConversationApiVersion(conversationUser!!, intArrayOf(ApiUtils.API_V4, 1))
         val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            conversationUser?.baseUrl!!,
-            ROOM_TYPE_ONE_TO_ONE,
-            ACTOR_TYPE,
-            userId,
-            null
+            version = apiVersion,
+            baseUrl = conversationUser?.baseUrl!!,
+            roomType = ROOM_TYPE_ONE_TO_ONE,
+            source = ACTOR_TYPE,
+            invite = userId
         )
         chatViewModel.createRoom(
             credentials!!,
diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsRepositoryImpl.kt
index a8073008b..4d17e08fa 100644
--- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsRepositoryImpl.kt
@@ -52,12 +52,12 @@ class ContactsRepositoryImpl @Inject constructor(
         conversationName: String?
     ): RoomOverall {
         val retrofitBucket: RetrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            _currentUser.baseUrl,
-            roomType,
-            sourceType,
-            userId,
-            conversationName
+            version = apiVersion,
+            baseUrl = _currentUser.baseUrl,
+            roomType = roomType,
+            source = sourceType,
+            invite = userId,
+            conversationName = conversationName
         )
         val response = ncApiCoroutines.createRoom(
             credentials,
diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepositoryImpl.kt
index 9c127b300..4ac3d1a3f 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationRepositoryImpl.kt
@@ -97,12 +97,10 @@ class ConversationCreationRepositoryImpl @Inject constructor(
 
     override suspend fun createRoom(roomType: String, conversationName: String?): RoomOverall {
         val retrofitBucket: RetrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            _currentUser.baseUrl,
-            roomType,
-            null,
-            null,
-            conversationName
+            version = apiVersion,
+            baseUrl = _currentUser.baseUrl,
+            roomType = roomType,
+            conversationName = conversationName
         )
         val response = ncApiCoroutines.createRoom(
             credentials,
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 70fcf9267..a964cc913 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -168,6 +168,7 @@ class ConversationInfoActivity :
 
             if (startGroupChat) {
                 Snackbar.make(binding.root, "TODO: start group chat...", Snackbar.LENGTH_LONG).show()
+                viewModel.createRoom()
             } else {
                 addParticipantsToConversation(participants)
             }
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
index f6debb14f..b6e8aab07 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt
@@ -120,6 +120,9 @@ class ConversationInfoViewModel @Inject constructor(
             ?.subscribe(GetRoomObserver())
     }
 
+    fun createRoom() {
+    }
+
     fun getCapabilities(user: User, token: String, conversationModel: ConversationModel) {
         _getCapabilitiesViewState.value = GetCapabilitiesStartState
 
diff --git a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt b/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt
index 6f561ef2d..814692f32 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/bottom/sheet/ProfileBottomSheet.kt
@@ -118,12 +118,10 @@ class ProfileBottomSheet(val ncApi: NcApi, val userModel: User, val viewThemeUti
         val apiVersion =
             ApiUtils.getConversationApiVersion(userModel, intArrayOf(ApiUtils.API_V4, 1))
         val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-            apiVersion,
-            userModel.baseUrl!!,
-            "1",
-            null,
-            userId,
-            null
+            version = apiVersion,
+            baseUrl = userModel.baseUrl!!,
+            roomType = "1",
+            invite = userId
         )
         val credentials = ApiUtils.getCredentials(userModel.username, userModel.token)
         ncApi.createRoom(
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
index 66cb5b2cb..674ee08a4 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt
@@ -298,25 +298,19 @@ object ApiUtils {
     @Suppress("LongParameterList")
     fun getRetrofitBucketForCreateRoom(
         version: Int,
-        baseUrl: String?,
         roomType: String,
-        source: String?,
-        invite: String?,
-        conversationName: String?
+        baseUrl: String? = null,
+        source: String? = null,
+        invite: String? = null,
+        conversationName: String? = null
     ): RetrofitBucket {
         val retrofitBucket = RetrofitBucket()
         retrofitBucket.url = getUrlForRooms(version, baseUrl)
         val queryMap: MutableMap<String, String> = HashMap()
         queryMap["roomType"] = roomType
-        if (invite != null) {
-            queryMap["invite"] = invite
-        }
-        if (source != null) {
-            queryMap["source"] = source
-        }
-        if (conversationName != null) {
-            queryMap["roomName"] = conversationName
-        }
+        invite?.let { queryMap["invite"] = it }
+        source?.let { queryMap["source"] = it }
+        conversationName?.let { queryMap["roomName"] = it }
         retrofitBucket.queryMap = queryMap
         return retrofitBucket
     }