diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a4c17575..e63d9a686 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -211,11 +211,11 @@
             android:theme="@style/AppTheme" />
 
         <activity
-            android:name=".conversation.info.ConversationInfoActivity"
+            android:name=".conversationinfo.ConversationInfoActivity"
             android:theme="@style/AppTheme" />
 
         <activity
-            android:name=".conversation.info.ConversationInfoEditActivity"
+            android:name=".conversationinfoedit.ConversationInfoEditActivity"
             android:theme="@style/AppTheme" />
 
         <activity
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 9dffd3ccc..72c31c10f 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -121,7 +121,7 @@ import com.nextcloud.talk.adapters.messages.VoiceMessageInterface
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.callbacks.MentionAutocompleteCallback
-import com.nextcloud.talk.conversation.info.ConversationInfoActivity
+import com.nextcloud.talk.conversationinfo.ConversationInfoActivity
 import com.nextcloud.talk.conversationlist.ConversationsListActivity
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.databinding.ControllerChatBinding
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt
rename to app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 0adb02829..721a8d084 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -24,7 +24,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.conversation.info
+package com.nextcloud.talk.conversationinfo
 
 import android.annotation.SuppressLint
 import android.content.Intent
@@ -59,6 +59,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.contacts.ContactsActivity
 import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage
 import com.nextcloud.talk.controllers.bottomsheet.items.listItemsWithImage
+import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.databinding.ActivityConversationInfoBinding
 import com.nextcloud.talk.events.EventStatus
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
rename to app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
index 6c87b536e..b3e6f701a 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/info/GuestAccessHelper.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt
@@ -1,4 +1,4 @@
-package com.nextcloud.talk.conversation.info
+package com.nextcloud.talk.conversationinfo
 
 import android.annotation.SuppressLint
 import android.content.Intent
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoEditActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoEditActivity.kt
rename to app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
index 69aa558ad..b2bb236a6 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/info/ConversationInfoEditActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfoedit/ConversationInfoEditActivity.kt
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.talk.conversation.info
+package com.nextcloud.talk.conversationinfoedit
 
 import android.app.Activity
 import android.content.Intent
@@ -209,6 +209,7 @@ class ConversationInfoEditActivity :
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }
@@ -248,6 +249,7 @@ class ConversationInfoEditActivity :
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }
@@ -314,6 +316,7 @@ class ConversationInfoEditActivity :
                 }
 
                 override fun onComplete() {
+                    // unused atm
                 }
             })
     }
@@ -344,7 +347,7 @@ class ConversationInfoEditActivity :
                 }
 
                 override fun onComplete() {
-                    // setEditMode(false)
+                    // unused atm
                 }
             })
     }
diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt
index 89b47c0bd..e061756be 100644
--- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt
+++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt
@@ -2,7 +2,9 @@
  * Nextcloud Talk application
  *
  * @author Tim Krüger
+ * @author Marcel Hibbe
  * Copyright (C) 2022 Tim Krüger <t@timkrueger.me>
+ * Copyright (C) 2023 Marcel Hibbe (dev@mhibbe.de)
  * Copyright (C) 2022 Nextcloud GmbH
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/res/menu/menu_conversation_info.xml b/app/src/main/res/menu/menu_conversation_info.xml
index bed56c781..9245eacf7 100644
--- a/app/src/main/res/menu/menu_conversation_info.xml
+++ b/app/src/main/res/menu/menu_conversation_info.xml
@@ -3,7 +3,9 @@
   Nextcloud Android Talk application
 
   @author Tobias Kaminsky
+  @author Marcel Hibbe
   Copyright (C) 2021 Tobias Kaminsky
+  Copyright (C) 2023 Marcel Hibbe (dev@mhibbe.de)
   Copyright (C) 2021 Nextcloud GmbH
  
   This program is free software: you can redistribute it and/or modify
diff --git a/app/src/main/res/menu/menu_conversation_info_edit.xml b/app/src/main/res/menu/menu_conversation_info_edit.xml
index 11d14789a..fb8481267 100644
--- a/app/src/main/res/menu/menu_conversation_info_edit.xml
+++ b/app/src/main/res/menu/menu_conversation_info_edit.xml
@@ -3,7 +3,9 @@
   Nextcloud Android Talk application
 
   @author Tobias Kaminsky
+  @author Marcel Hibbe
   Copyright (C) 2021 Tobias Kaminsky
+  Copyright (C) 2023 Marcel Hibbe (dev@mhibbe.de)
   Copyright (C) 2021 Nextcloud GmbH
  
   This program is free software: you can redistribute it and/or modify