diff --git a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
index 15f71979935..5d14d5ce489 100644
--- a/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/cache/mailboxContent/MessageController.kt
@@ -205,7 +205,6 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
         fun getNewestMessages(folderId: String, limit: Int, realm: MutableRealm): List<Message> {
             return getOldestOrNewestMessagesQuery(folderId, Sort.DESCENDING, realm, limit).find()
         }
-
         //endregion
 
         //region Edit data
diff --git a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
index 8612a7bd3da..7e7a6db02eb 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -617,11 +617,11 @@ class MainViewModel @Inject constructor(
 
     //region Archive
     fun archiveMessage(threadUid: String, message: Message) {
-        archiveThreadsOrMessage(listOf(threadUid), message = message)
+        archiveThreadsOrMessage(threadsUids = listOf(threadUid), message = message)
     }
 
     fun archiveThread(threadUid: String) {
-        archiveThreadsOrMessage(listOf(threadUid))
+        archiveThreadsOrMessage(threadsUids = listOf(threadUid))
     }
 
     fun archiveThreads(threadsUids: List<String>) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
index baaac402847..b03db9d7bce 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt
@@ -173,16 +173,13 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     override fun getRightPane(): FragmentContainerView? = _binding?.threadHostFragment
 
     override fun getAnchor(): View? {
-        return if (isSelectedThreadAtLastPositionOrStart() || !isOnlyRightShown()) {
-            _binding?.newMessageFab
-        } else {
+        return if (isOnlyRightShown()) {
             _binding?.threadHostFragment?.getFragment<ThreadFragment?>()?.getAnchor()
+        } else {
+            _binding?.newMessageFab
         }
     }
 
-    private fun isSelectedThreadAtLastPositionOrStart() =
-        threadListAdapter.openedThreadPosition == 1 || threadListAdapter.openedThreadPosition == threadListAdapter.dataSet.size
-
     override fun doAfterFolderChanged() {
         navigateFromNotificationToThread()
     }
@@ -632,7 +629,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         }
     }
 
-
     private fun checkLastUpdateDay() {
         if (lastUpdatedDate?.isToday() == false) mainViewModel.forceTriggerCurrentFolder()
     }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
index 86f61213120..bfe1725c3c5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingRadioButtonView.kt
@@ -55,7 +55,6 @@ class SettingRadioButtonView @JvmOverloads constructor(
                 associatedValue = getString(R.styleable.SettingRadioButtonView_value)
 
                 setIcon(iconDrawable)
-
                 text.text = textString
                 checkMark.setColorFilter(checkMarkColor)
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
index 421e962779e..3e2f27af611 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/thread/ThreadFragment.kt
@@ -467,7 +467,6 @@ class ThreadFragment : Fragment() {
 
     private fun observeClosedThread() {
         mainViewModel.autoAdvanceTrigger.observe(viewLifecycleOwner) { listThreadsUids ->
-            println("called")
             tryToAutoAdvance(localSettings.autoAdvanceMode, listThreadsUids)
         }
     }
@@ -631,22 +630,6 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
-    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
-        with(twoPaneFragment.threadListAdapter) {
-            return when (autoAdvanceMode) {
-                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                AutoAdvanceMode.LIST_THREAD -> null
-                AutoAdvanceMode.NATURAL_THREAD -> {
-                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
-                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
-                    } else {
-                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
-                    }
-                }
-            }
-        }
-
     private fun tryToAutoAdvance(autoAdvanceMode: AutoAdvanceMode, listThreadUids: List<String>) =
         with(twoPaneFragment.threadListAdapter) {
             if (!listThreadUids.contains(openedThreadUid)) return@with
@@ -665,6 +648,22 @@ class ThreadFragment : Fragment() {
             }
         }
 
+    private fun getNextThreadToOpenByPosition(startingThreadIndex: Int, autoAdvanceMode: AutoAdvanceMode): Pair<Thread, Int>? =
+        with(twoPaneFragment.threadListAdapter) {
+            return when (autoAdvanceMode) {
+                AutoAdvanceMode.PREVIOUS_THREAD -> getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.FOLLOWING_THREAD -> getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                AutoAdvanceMode.LIST_THREAD -> null
+                AutoAdvanceMode.NATURAL_THREAD -> {
+                    if (localSettings.autoAdvanceIntelligentMode == AutoAdvanceMode.PREVIOUS_THREAD) {
+                        getNextThread(startingThreadIndex, direction = PREVIOUS_CHRONOLOGICAL_THREAD)
+                    } else {
+                        getNextThread(startingThreadIndex, direction = NEXT_CHRONOLOGICAL_THREAD)
+                    }
+                }
+            }
+        }
+
     enum class HeaderState {
         ELEVATED,
         LOWERED,
diff --git a/app/src/main/res/layout/view_setting_radio_button.xml b/app/src/main/res/layout/view_setting_radio_button.xml
index 921e6a0a85f..530af1bdc9c 100644
--- a/app/src/main/res/layout/view_setting_radio_button.xml
+++ b/app/src/main/res/layout/view_setting_radio_button.xml
@@ -33,18 +33,12 @@
         android:importantForAccessibility="no"
         android:visibility="gone" />
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="Simple messages" />
-    </LinearLayout>
+        tools:text="Simple messages" />
 
     <ImageView
         android:id="@+id/checkMark"