diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index ff6343534..a51124bc8 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -61,7 +61,6 @@ class ConversationItem(
     private val chatMessage = model.lastMessage?.asModel()
     var mHolder: ConversationItemViewHolder? = null
 
-
     constructor(
         conversation: ConversationModel,
         user: User,
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 3e61744cf..cae0a5c4a 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -1884,7 +1884,7 @@ class ConversationsListActivity :
         val firstVisible = layoutManager?.findFirstVisibleItemPosition() ?: 0
         val firstItem = adapter?.getItem(firstVisible)
         val firstTop = (firstItem as ConversationItem).mHolder?.itemView?.top
-        val firstOffset = firstTop?.minus(44) ?: 0
+        val firstOffset = firstTop?.minus(CONVERSATION_ITEM_HEIGHT) ?: 0
 
         appPreferences.setConversationListPositionAndOffset(firstVisible, firstOffset)
 
@@ -2229,5 +2229,6 @@ class ConversationsListActivity :
         private const val SIXTEEN_HOURS_IN_SECONDS: Long = 57600
         const val LONG_1000: Long = 1000
         private const val NOTE_TO_SELF_SHORTCUT_ID = "NOTE_TO_SELF_SHORTCUT_ID"
+        private const val CONVERSATION_ITEM_HEIGHT = 44
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
index 1cdc75a43..18afbb6a1 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
@@ -425,7 +425,7 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
             async { readString(CONVERSATION_LIST_POSITION_OFFSET).first() }
         }.getCompleted()
 
-        if (pairString.isEmpty()) return Pair(0,0)
+        if (pairString.isEmpty()) return Pair(0, 0)
 
         val pairArr = pairString.split(',')
         val position = pairArr[0].toInt()