diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 7569f76f3..fa3e50144 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -585,7 +585,7 @@ class ChatController(args: Bundle) :
                         if (layoutManager!!.findFirstCompletelyVisibleItemPosition() < newMessagesCount) {
                             newMessagesCount = 0
 
-                            if (binding.popupBubbleView.isShown == true) {
+                            if (binding.popupBubbleView.isShown) {
                                 binding.popupBubbleView.hide()
                             }
                         }
@@ -640,7 +640,7 @@ class ChatController(args: Bundle) :
                     }
                 } catch (npe: NullPointerException) {
                     // view binding can be null
-                    // since this is called asynchrously and UI might have been destroyed in the meantime
+                    // since this is called asynchronously and UI might have been destroyed in the meantime
                     Log.i(TAG, "UI destroyed - view binding already gone")
                 }
             }
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 873946d95..e1ffca885 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -1007,8 +1007,14 @@ class ConversationInfoController(args: Bundle) :
                 R.drawable.ic_lock_grey600_24px,
                 context!!.getString(R.string.nc_attendee_pin, participant.attendeePin)
             ),
-            BasicListItemWithImage(R.drawable.ic_pencil_grey600_24dp, context!!.getString(R.string.nc_promote)),
-            BasicListItemWithImage(R.drawable.ic_pencil_grey600_24dp, context!!.getString(R.string.nc_demote)),
+            BasicListItemWithImage(
+                R.drawable.ic_pencil_grey600_24dp,
+                context!!.getString(R.string.nc_promote)
+            ),
+            BasicListItemWithImage(
+                R.drawable.ic_pencil_grey600_24dp,
+                context!!.getString(R.string.nc_demote)
+            ),
             BasicListItemWithImage(
                 R.drawable.ic_delete_grey600_24dp,
                 context!!.getString(R.string.nc_remove_participant)