diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 4826d3d1ea..e140dc3b45 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -13,8 +13,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1834" />
+                            <option name="x" value="520" />
+                            <option name="y" value="859" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -25,8 +25,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="4708" />
+                            <option name="x" value="256" />
+                            <option name="y" value="6612" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -61,8 +61,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3614" />
+                            <option name="x" value="520" />
+                            <option name="y" value="2283" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -73,8 +73,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="4682" />
+                            <option name="x" value="520" />
+                            <option name="y" value="6333" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -85,8 +85,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="12" />
-                            <option name="y" value="368" />
+                            <option name="x" value="3428" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -113,13 +113,25 @@
                       </LayoutPositions>
                     </value>
                   </entry>
+                  <entry key="autoAdvanceFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="520" />
+                            <option name="y" value="1927" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
                   <entry key="autoReplySettingFragment">
                     <value>
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="2546" />
+                            <option name="x" value="764" />
+                            <option name="y" value="1991" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -130,8 +142,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1122" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3059" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -142,8 +154,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="766" />
+                            <option name="x" value="764" />
+                            <option name="y" value="4127" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -154,8 +166,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="410" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3771" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -166,8 +178,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="724" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4084" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -192,8 +204,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5750" />
+                            <option name="x" value="520" />
+                            <option name="y" value="7045" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -204,8 +216,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="256" />
-                            <option name="y" value="368" />
+                            <option name="x" value="3672" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -216,8 +228,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="368" />
+                            <option name="x" value="520" />
+                            <option name="y" value="1215" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -228,8 +240,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1478" />
+                            <option name="x" value="764" />
+                            <option name="y" value="3415" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -240,8 +252,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5394" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5621" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -276,8 +288,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="5038" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5977" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -300,8 +312,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2190" />
+                            <option name="x" value="520" />
+                            <option name="y" value="2639" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -355,8 +367,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3970" />
+                            <option name="x" value="520" />
+                            <option name="y" value="503" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -367,8 +379,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="3479" />
+                            <option name="x" value="256" />
+                            <option name="y" value="368" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -460,8 +472,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="5750" />
+                            <option name="x" value="256" />
+                            <option name="y" value="7045" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -481,8 +493,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1436" />
+                            <option name="x" value="520" />
+                            <option name="y" value="3372" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -507,12 +519,17 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="2179" />
+                            <option name="x" value="256" />
+                            <option name="y" value="5044" />
                           </Point>
                         </option>
                         <option name="myPositions">
                           <map>
+                            <entry key="action_settingsFragment_to_aiEngineSettingFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
                             <entry key="action_settings_to_accentColorSetting">
                               <value>
                                 <LayoutPositions />
@@ -523,6 +540,11 @@
                                 <LayoutPositions />
                               </value>
                             </entry>
+                            <entry key="action_settings_to_autoAdvanceSettings">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
                             <entry key="action_settings_to_dataManagementSettings">
                               <value>
                                 <LayoutPositions />
@@ -573,8 +595,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="1834" />
+                            <option name="x" value="764" />
+                            <option name="y" value="2347" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -585,8 +607,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="2190" />
+                            <option name="x" value="764" />
+                            <option name="y" value="2703" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -597,8 +619,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="1232" />
-                            <option name="y" value="3258" />
+                            <option name="x" value="764" />
+                            <option name="y" value="5152" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -609,8 +631,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="3258" />
+                            <option name="x" value="520" />
+                            <option name="y" value="5152" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -630,8 +652,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="4326" />
+                            <option name="x" value="520" />
+                            <option name="y" value="6689" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -654,8 +676,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="1080" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4440" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -666,8 +688,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="744" />
-                            <option name="y" value="3835" />
+                            <option name="x" value="256" />
+                            <option name="y" value="5400" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -678,8 +700,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2546" />
+                            <option name="x" value="520" />
+                            <option name="y" value="1571" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -690,8 +712,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="500" />
-                            <option name="y" value="4694" />
+                            <option name="x" value="12" />
+                            <option name="y" value="6945" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -746,8 +768,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="988" />
-                            <option name="y" value="2902" />
+                            <option name="x" value="520" />
+                            <option name="y" value="4796" />
                           </Point>
                         </option>
                       </LayoutPositions>
diff --git a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
index 44e27b39b8..258bac6f13 100644
--- a/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
+++ b/app/src/main/java/com/infomaniak/mail/MatomoMail.kt
@@ -263,6 +263,10 @@ object MatomoMail : MatomoCore {
         trackEvent("homeScreenShortcuts", name)
     }
 
+    fun Fragment.trackAutoAdvanceEvent(name: String) {
+        trackEvent("settingsAutoAdvance", name)
+    }
+
     // We need to invert this logical value to keep a coherent value for analytics because actions
     // conditions are inverted (ex: if the condition is `message.isSpam`, then we want to unspam)
     private fun Boolean.toMailActionValue() = (!this).toFloat()
diff --git a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
index 7f1238ffd7..b3be6234d3 100644
--- a/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/LocalSettings.kt
@@ -64,6 +64,8 @@ class LocalSettings private constructor(context: Context) : SharedValues {
     var showPermissionsOnboarding by sharedValue("showPermissionsOnboardingKey", true)
     var isSentryTrackingEnabled by sharedValue("isSentryTrackingEnabledKey", true)
     var isMatomoTrackingEnabled by sharedValue("isMatomoTrackingEnabledKey", true)
+    var autoAdvanceMode by sharedValue("autoAdvanceModeKey", AutoAdvanceMode.THREADS_LIST)
+    var autoAdvanceNaturalThread by sharedValue("autoAdvanceNaturalThreadKey", AutoAdvanceMode.FOLLOWING_THREAD)
 
     fun removeSettings() = sharedPreferences.transaction { clear() }
 
@@ -191,6 +193,13 @@ class LocalSettings private constructor(context: Context) : SharedValues {
         ASK_ME("false", R.string.settingsOptionAskMe, "askMe"),
     }
 
+    enum class AutoAdvanceMode(val matomoValue: String, @StringRes val localisedNameRes: Int) {
+        PREVIOUS_THREAD("previousThread", R.string.settingsAutoAdvancePreviousThreadDescription),
+        FOLLOWING_THREAD("followingThread", R.string.settingsAutoAdvanceFollowingThreadDescription),
+        THREADS_LIST("listOfThread", R.string.settingsAutoAdvanceListOfThreadsDescription),
+        NATURAL_THREAD("naturalThread", R.string.settingsAutoAdvanceNaturalThreadDescription),
+    }
+
     companion object {
 
         private val TAG = LocalSettings::class.java.simpleName
diff --git a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
index 66aede05b0..3558ae0a7b 100644
--- a/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/api/ApiRepository.kt
@@ -60,8 +60,6 @@ import com.infomaniak.mail.ui.newMessage.AiViewModel.Shortcut
 import io.realm.kotlin.ext.copyFromRealm
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
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 024f3138c7..db0bf4b6bf 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
@@ -25,6 +25,7 @@ import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.utils.AccountUtils
 import io.realm.kotlin.MutableRealm
+import io.realm.kotlin.Realm
 import io.realm.kotlin.TypedRealm
 import io.realm.kotlin.UpdatePolicy
 import io.realm.kotlin.ext.copyFromRealm
@@ -137,6 +138,13 @@ class MessageController @Inject constructor(private val mailboxContentRealm: Rea
     fun getMessagesAsync(messageUid: String): Flow<ResultsChange<Message>> {
         return getMessagesQuery(messageUid, mailboxContentRealm()).asFlow()
     }
+
+    fun getMessageCountInThreadForFolder(threadUid: String, folderId: String, realm: Realm): Long? {
+        return ThreadController.getThread(threadUid, realm)
+            ?.messages?.query("${Message::folderId.name} == $0", folderId)
+            ?.count()
+            ?.find()
+    }
     //endregion
 
     //region Edit data
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt b/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
index 1db4c0f71e..e1070e8619 100644
--- a/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
+++ b/app/src/main/java/com/infomaniak/mail/data/models/signature/Signature.kt
@@ -18,7 +18,6 @@
 package com.infomaniak.mail.data.models.signature
 
 import android.content.Context
-import com.infomaniak.lib.core.utils.context
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.draft.Draft
 import com.infomaniak.mail.utils.AccountUtils
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 2eca089ed3..96e95689a7 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/MainViewModel.kt
@@ -110,6 +110,8 @@ class MainViewModel @Inject constructor(
     val reportPhishingTrigger = SingleLiveEvent<Unit>()
     val canInstallUpdate = MutableLiveData(false)
 
+    val autoAdvanceThreadsUids = MutableLiveData<List<String>>()
+
     val mailboxesLive = mailboxController.getMailboxesAsync(AccountUtils.currentUserId).asLiveData(ioCoroutineContext)
 
     //region Multi selection
@@ -477,6 +479,8 @@ class MainViewModel @Inject constructor(
 
         deleteThreadOrMessageTrigger.postValue(Unit)
         if (apiResponse.isSuccess()) {
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
+
             refreshFoldersAsync(
                 mailbox = mailbox,
                 messagesFoldersIds = messages.getFoldersIds(exception = trashId),
@@ -558,12 +562,12 @@ class MainViewModel @Inject constructor(
     //region Move
     fun moveThreadsOrMessageTo(
         destinationFolderId: String,
-        threadsUids: Array<String>,
+        threadsUids: List<String>,
         messageUid: String? = null,
     ) = viewModelScope.launch(ioCoroutineContext) {
         val mailbox = currentMailbox.value!!
         val destinationFolder = folderController.getFolder(destinationFolderId)!!
-        val threads = getActionThreads(threadsUids.toList()).ifEmpty { return@launch }
+        val threads = getActionThreads(threadsUids).ifEmpty { return@launch }
         val message = messageUid?.let { messageController.getMessage(it)!! }
 
         val messages = sharedUtils.getMessagesToMove(threads, message)
@@ -571,6 +575,8 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
+
             refreshFoldersAsync(
                 mailbox = mailbox,
                 messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id),
@@ -636,6 +642,8 @@ class MainViewModel @Inject constructor(
         val apiResponse = ApiRepository.moveMessages(mailbox.uuid, messages.getUids(), destinationFolder.id)
 
         if (apiResponse.isSuccess()) {
+            if (shouldAutoAdvance(message, threadsUids)) autoAdvanceThreadsUids.postValue(threadsUids)
+
             val messagesFoldersIds = messages.getFoldersIds(exception = destinationFolder.id)
             refreshFoldersAsync(
                 mailbox = mailbox,
@@ -897,7 +905,7 @@ class MainViewModel @Inject constructor(
 
     fun moveToNewFolder(
         name: String,
-        threadsUids: Array<String>,
+        threadsUids: List<String>,
         messageUid: String?,
     ) = viewModelScope.launch(ioCoroutineContext) {
         val newFolderId = createNewFolderSync(name) ?: return@launch
@@ -1039,10 +1047,20 @@ class MainViewModel @Inject constructor(
         snackbarManager.postValue(appContext.getString(snackbarTitleRes))
     }
 
+    private fun threadHasOnlyOneMessageLeftInCurrentFolder(threadUid: String): Boolean {
+        val folderId = currentFolderId ?: return false
+        return messageController.getMessageCountInThreadForFolder(threadUid, folderId, mailboxContentRealm()) == 1L
+    }
+
+    private fun shouldAutoAdvance(message: Message?, threadsUids: List<String>): Boolean {
+        val isWorkingWithThread = message == null
+        return isWorkingWithThread || threadHasOnlyOneMessageLeftInCurrentFolder(threadsUids.first())
+    }
+
     companion object {
         private val TAG: String = MainViewModel::class.java.simpleName
         private val DEFAULT_SELECTED_FOLDER = FolderRole.INBOX
-        private const val REFRESH_DELAY = 2_000L // We add this delay because it doesn't always work if we just use the `etop`.
+        private const val REFRESH_DELAY = 2_000L // We add this delay because `etop` isn't always big enough.
         private const val MAX_REFRESH_DELAY = 6_000L
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
index 7e6ae90090..d9c2892cdd 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt
@@ -89,18 +89,16 @@ class ThreadListAdapter @Inject constructor(
     private var swipingIsAuthorized: Boolean = true
     private var isLoadMoreDisplayed = false
 
-    private var onThreadClicked: ((thread: Thread) -> Unit)? = null
-    private var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
-    private var onLoadMoreClicked: (() -> Unit)? = null
-
     private var folderRole: FolderRole? = null
-    private var onSwipeFinished: (() -> Unit)? = null
     private var multiSelection: MultiSelectionListener<Thread>? = null
     private var isFolderNameVisible: Boolean = false
+    private var threadListAdapterCallback: ThreadListAdapterCallback? = null
 
     //region Tablet mode
-    private var openedThreadPosition: Int? = null
-    private var openedThreadUid: String? = null
+    var openedThreadPosition: Int? = null
+        private set
+    var openedThreadUid: String? = null
+        private set
     //endregion
 
     init {
@@ -109,20 +107,14 @@ class ThreadListAdapter @Inject constructor(
 
     operator fun invoke(
         folderRole: FolderRole?,
-        onSwipeFinished: (() -> Unit)? = null,
+        threadListAdapterCallback: ThreadListAdapterCallback,
         multiSelection: MultiSelectionListener<Thread>? = null,
         isFolderNameVisible: Boolean = false,
-        onThreadClicked: ((thread: Thread) -> Unit),
-        onFlushClicked: ((dialogTitle: String) -> Unit)? = null,
-        onLoadMoreClicked: (() -> Unit)? = null,
     ) {
         this.folderRole = folderRole
-        this.onSwipeFinished = onSwipeFinished
         this.multiSelection = multiSelection
         this.isFolderNameVisible = isFolderNameVisible
-        this.onThreadClicked = onThreadClicked
-        this.onFlushClicked = onFlushClicked
-        this.onLoadMoreClicked = onLoadMoreClicked
+        this.threadListAdapterCallback = threadListAdapterCallback
     }
 
     override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
@@ -295,7 +287,7 @@ class ThreadListAdapter @Inject constructor(
         if (multiSelection?.isEnabled == true) {
             toggleMultiSelectedThread(thread)
         } else {
-            onThreadClicked?.invoke(thread)
+            threadListAdapterCallback?.onThreadClicked?.invoke(thread)
             // If the Thread is `onlyOneDraft`, we'll directly navigate to the NewMessageActivity.
             // It means that we won't go to the ThreadFragment, so there's no need to select anything.
             if (thread.uid != openedThreadUid && !thread.isOnlyOneDraft) selectNewThread(position, thread.uid)
@@ -311,6 +303,20 @@ class ThreadListAdapter @Inject constructor(
 
         if (oldPosition != null && oldPosition < itemCount) notifyItemChanged(oldPosition, NotificationType.SELECTED_STATE)
         if (newPosition != null) notifyItemChanged(newPosition, NotificationType.SELECTED_STATE)
+        if (oldPosition != null && newPosition != null) {
+            threadListAdapterCallback?.onPositionClickedChanged?.invoke(newPosition, oldPosition)
+        }
+    }
+
+    fun getNextThread(startingThreadIndex: Int, direction: Int): Pair<Thread, Int>? {
+        var currentThreadIndex = startingThreadIndex + direction
+
+        while (currentThreadIndex >= 0 && currentThreadIndex <= dataSet.lastIndex) {
+            if (dataSet[currentThreadIndex] is Thread) return dataSet[currentThreadIndex] as Thread to currentThreadIndex
+            currentThreadIndex += direction
+        }
+
+        return null
     }
 
     /**
@@ -454,14 +460,14 @@ class ThreadListAdapter @Inject constructor(
         flushButton.apply {
             val buttonText = context.getString(buttonTextId)
             text = buttonText
-            setOnClickListener { onFlushClicked?.invoke(buttonText) }
+            setOnClickListener { threadListAdapterCallback?.onFlushClicked?.invoke(buttonText) }
         }
     }
 
     private fun ItemThreadLoadMoreButtonBinding.displayLoadMoreButton() {
         loadMoreButton.setOnClickListener {
             if (dataSet.last() is Unit) dataSet = dataSet.toMutableList().apply { removeLastOrNull() }
-            onLoadMoreClicked?.invoke()
+            threadListAdapterCallback?.onLoadMoreClicked?.invoke()
         }
     }
 
@@ -538,7 +544,7 @@ class ThreadListAdapter @Inject constructor(
 
     override fun onSwipeAnimationFinished(viewHolder: ThreadListViewHolder) {
         viewHolder.isSwipedOverHalf = false
-        onSwipeFinished?.invoke()
+        threadListAdapterCallback?.onSwipeFinished?.invoke()
         unblockOtherSwipes()
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt
new file mode 100644
index 0000000000..35f25022f1
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapterCallback.kt
@@ -0,0 +1,28 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.folder
+
+import com.infomaniak.mail.data.models.thread.Thread
+
+interface ThreadListAdapterCallback {
+    var onSwipeFinished: (() -> Unit)?
+    var onThreadClicked: ((thread: Thread) -> Unit)
+    var onFlushClicked: ((dialogTitle: String) -> Unit)?
+    var onLoadMoreClicked: (() -> Unit)?
+    var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)?
+}
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 3344df5e3c..7f264d257f 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
@@ -55,7 +55,6 @@ import com.infomaniak.mail.MatomoMail.trackMultiSelectionEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackThreadListEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.LocalSettings.SwipeAction
 import com.infomaniak.mail.data.LocalSettings.ThreadDensity.COMPACT
 import com.infomaniak.mail.data.models.Folder
@@ -104,9 +103,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
 
     private var isFirstTimeRefreshingThreads = true
 
-    @Inject
-    lateinit var localSettings: LocalSettings
-
     @Inject
     lateinit var notificationManagerCompat: NotificationManagerCompat
 
@@ -287,39 +283,42 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     }
 
     private fun setupAdapter() {
-
         threadListAdapter(
             folderRole = mainViewModel.currentFolder.value?.role,
-            onSwipeFinished = { threadListViewModel.isRecoveringFinished.value = true },
+            threadListAdapterCallback = object : ThreadListAdapterCallback {
+                override var onSwipeFinished: (() -> Unit)? = { threadListViewModel.isRecoveringFinished.value = true }
+                override var onThreadClicked: (Thread) -> Unit = ::navigateToThread
+                override var onFlushClicked: ((dialogTitle: String) -> Unit)? = { dialogTitle ->
+                    val trackerName = when {
+                        isCurrentFolderRole(FolderRole.TRASH) -> "emptyTrash"
+                        isCurrentFolderRole(FolderRole.DRAFT) -> "emptyDraft"
+                        isCurrentFolderRole(FolderRole.SPAM) -> "emptySpam"
+                        else -> null
+                    }
+
+                    trackerName?.let { trackThreadListEvent(it) }
+
+                    descriptionDialog.show(
+                        title = dialogTitle,
+                        description = getString(R.string.threadListEmptyFolderAlertDescription),
+                        onPositiveButtonClicked = {
+                            trackThreadListEvent("${trackerName}Confirm")
+                            mainViewModel.flushFolder()
+                        },
+                    )
+                }
+                override var onLoadMoreClicked: (() -> Unit)? = {
+                    trackThreadListEvent("loadMore")
+                    mainViewModel.getOnePageOfOldMessages()
+                }
+                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
+                    ::updateAutoAdvanceNaturalThread
+            },
             multiSelection = object : MultiSelectionListener<Thread> {
                 override var isEnabled by mainViewModel::isMultiSelectOn
                 override val selectedItems by mainViewModel::selectedThreads
                 override val publishSelectedItems = mainViewModel::publishSelectedItems
             },
-            onThreadClicked = ::navigateToThread,
-            onFlushClicked = { dialogTitle ->
-                val trackerName = when {
-                    isCurrentFolderRole(FolderRole.TRASH) -> "emptyTrash"
-                    isCurrentFolderRole(FolderRole.DRAFT) -> "emptyDraft"
-                    isCurrentFolderRole(FolderRole.SPAM) -> "emptySpam"
-                    else -> null
-                }
-
-                trackerName?.let { trackThreadListEvent(it) }
-
-                descriptionDialog.show(
-                    title = dialogTitle,
-                    description = getString(R.string.threadListEmptyFolderAlertDescription),
-                    onPositiveButtonClicked = {
-                        trackThreadListEvent("${trackerName}Confirm")
-                        mainViewModel.flushFolder()
-                    },
-                )
-            },
-            onLoadMoreClicked = {
-                trackThreadListEvent("loadMore")
-                mainViewModel.getOnePageOfOldMessages()
-            },
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
index fe07289bdc..cb97c7ce18 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt
@@ -33,6 +33,8 @@ import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.R
+import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
 import com.infomaniak.mail.data.cache.mailboxContent.FolderController
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.ui.MainActivity
@@ -53,6 +55,9 @@ abstract class TwoPaneFragment : Fragment() {
     @Inject
     lateinit var threadListAdapter: ThreadListAdapter
 
+    @Inject
+    lateinit var localSettings: LocalSettings
+
     @ColorRes
     abstract fun getStatusBarColor(): Int
     abstract fun getLeftPane(): View?
@@ -184,8 +189,7 @@ abstract class TwoPaneFragment : Fragment() {
         }
     }
 
-    private fun computeTwoPaneWidths(widthPixels: Int, isThreadOpen: Boolean): Pair<Int, Int> = with(twoPaneViewModel) {
-
+    private fun computeTwoPaneWidths(widthPixels: Int, isThreadOpen: Boolean): Pair<Int, Int> {
         val leftPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.leftPaneWidthRatio)
         val rightPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.rightPaneWidthRatio)
 
@@ -217,4 +221,12 @@ abstract class TwoPaneFragment : Fragment() {
 
         setSystemBarsColors(statusBarColor = statusBarColor, navigationBarColor = null)
     }
+
+    protected fun updateAutoAdvanceNaturalThread(currentPosition: Int, previousPosition: Int) {
+        localSettings.autoAdvanceNaturalThread = if (currentPosition > previousPosition) {
+            AutoAdvanceMode.FOLLOWING_THREAD
+        } else {
+            AutoAdvanceMode.PREVIOUS_THREAD
+        }
+    }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
index b2d5df7637..94aeee2201 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt
@@ -104,7 +104,7 @@ class MoveFragment : MenuFoldersFragment() {
         inputDialog.setCallbacks(
             onPositiveButtonClicked = { folderName ->
                 trackCreateFolderEvent("confirm")
-                mainViewModel.moveToNewFolder(folderName, navigationArgs.threadsUids, navigationArgs.messageUid)
+                mainViewModel.moveToNewFolder(folderName, navigationArgs.threadsUids.toList(), navigationArgs.messageUid)
             },
             onErrorCheck = ::checkForFolderCreationErrors,
         )
@@ -133,7 +133,7 @@ class MoveFragment : MenuFoldersFragment() {
     }
 
     override fun onFolderSelected(folderId: String): Unit = with(navigationArgs) {
-        mainViewModel.moveThreadsOrMessageTo(folderId, threadsUids, messageUid)
+        mainViewModel.moveThreadsOrMessageTo(folderId, threadsUids.toList(), messageUid)
         findNavController().popBackStack()
     }
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
index 3c6bb01ebb..515f6f4851 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt
@@ -45,11 +45,13 @@ import com.infomaniak.lib.core.utils.showKeyboard
 import com.infomaniak.mail.MatomoMail.SEARCH_DELETE_NAME
 import com.infomaniak.mail.MatomoMail.SEARCH_VALIDATE_NAME
 import com.infomaniak.mail.MatomoMail.trackSearchEvent
+import com.infomaniak.mail.MatomoMail.trackThreadListEvent
 import com.infomaniak.mail.R
-import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.models.Folder
+import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.databinding.FragmentSearchBinding
+import com.infomaniak.mail.ui.main.folder.ThreadListAdapterCallback
 import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
 import com.infomaniak.mail.ui.main.search.SearchFolderAdapter.SearchFolderElement
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
@@ -57,7 +59,6 @@ import com.infomaniak.mail.utils.RealmChangesBinding.Companion.bindResultsChange
 import com.infomaniak.mail.utils.Utils.Shortcuts
 import com.infomaniak.mail.utils.extensions.*
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class SearchFragment : TwoPaneFragment() {
@@ -66,8 +67,6 @@ class SearchFragment : TwoPaneFragment() {
     private val binding get() = _binding!! // This property is only valid between onCreateView and onDestroyView
 
     private val searchViewModel: SearchViewModel by viewModels()
-    @Inject
-    lateinit var localSettings: LocalSettings
 
     private val showLoadingTimer: CountDownTimer by lazy { Utils.createRefreshTimer(onTimerFinish = ::showRefreshLayout) }
 
@@ -150,16 +149,26 @@ class SearchFragment : TwoPaneFragment() {
         threadListAdapter(
             folderRole = null,
             isFolderNameVisible = true,
-            onThreadClicked = { thread ->
-                with(searchViewModel) {
-                    if (!isLengthTooShort(currentSearchQuery)) history.value = currentSearchQuery
-                    binding.searchBar.searchTextInput.apply {
-                        hideKeyboard()
-                        clearFocus()
+            threadListAdapterCallback = object : ThreadListAdapterCallback {
+                override var onSwipeFinished: (() -> Unit)? = null
+                override var onThreadClicked: (Thread) -> Unit = { thread ->
+                    with(searchViewModel) {
+                        if (!isLengthTooShort(currentSearchQuery)) history.value = currentSearchQuery
+                        binding.searchBar.searchTextInput.apply {
+                            hideKeyboard()
+                            clearFocus()
+                        }
+                        navigateToThread(thread)
                     }
-                    navigateToThread(thread)
                 }
-            },
+                override var onFlushClicked: ((dialogTitle: String) -> Unit)? = null
+                override var onLoadMoreClicked: (() -> Unit)? = {
+                    trackThreadListEvent("loadMore")
+                    mainViewModel.getOnePageOfOldMessages()
+                }
+                override var onPositionClickedChanged: ((position: Int, previousPosition: Int) -> Unit)? =
+                    ::updateAutoAdvanceNaturalThread
+            }
         )
 
         threadListAdapter.stateRestorationPolicy = StateRestorationPolicy.PREVENT_WHEN_EMPTY
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
new file mode 100644
index 0000000000..f040a44083
--- /dev/null
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/AutoAdvanceSettingsFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2024 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.main.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import com.infomaniak.lib.core.utils.safeBinding
+import com.infomaniak.mail.MatomoMail.trackAutoAdvanceEvent
+import com.infomaniak.mail.R
+import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
+import com.infomaniak.mail.databinding.FragmentAutoAdvanceSettingsBinding
+import com.infomaniak.mail.utils.extensions.setSystemBarsColors
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AutoAdvanceSettingsFragment : Fragment() {
+
+    private var binding: FragmentAutoAdvanceSettingsBinding by safeBinding()
+
+    @Inject
+    lateinit var localSettings: LocalSettings
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return FragmentAutoAdvanceSettingsBinding.inflate(inflater, container, false).also { binding = it }.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
+        super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors()
+
+        radioGroup.initBijectionTable(
+            R.id.lastAction to AutoAdvanceMode.NATURAL_THREAD,
+            R.id.nextThread to AutoAdvanceMode.FOLLOWING_THREAD,
+            R.id.listThread to AutoAdvanceMode.THREADS_LIST,
+            R.id.lastThread to AutoAdvanceMode.PREVIOUS_THREAD,
+        )
+
+        radioGroup.check(localSettings.autoAdvanceMode)
+
+        descriptionLastAction.isVisible = localSettings.autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
+
+        radioGroup.onItemCheckedListener { _, _, autoAdvanceMode ->
+            chooseAutoAdvanceMode(autoAdvanceMode as AutoAdvanceMode)
+            descriptionLastAction.isVisible = autoAdvanceMode == AutoAdvanceMode.NATURAL_THREAD
+            trackAutoAdvanceEvent(autoAdvanceMode.matomoValue)
+        }
+    }
+
+    private fun chooseAutoAdvanceMode(autoAdvanceMode: AutoAdvanceMode) {
+        localSettings.autoAdvanceMode = autoAdvanceMode
+    }
+}
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
index a12254cd84..e955030b71 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt
@@ -95,6 +95,7 @@ class SettingsFragment : Fragment() {
             settingsAccentColor.setSubtitle(accentColor.localisedNameRes)
             settingsThreadMode.setSubtitle(threadMode.localisedNameRes)
             settingsExternalContent.setSubtitle(externalContent.localisedNameRes)
+            settingsAutomaticAdvance.setSubtitle(autoAdvanceMode.localisedNameRes)
         }
     }
 
@@ -159,6 +160,10 @@ class SettingsFragment : Fragment() {
         settingsDataManagement.setOnClickListener {
             animatedNavigation(SettingsFragmentDirections.actionSettingsToDataManagementSettings())
         }
+
+        settingsAutomaticAdvance.setOnClickListener {
+            animatedNavigation(SettingsFragmentDirections.actionSettingsToAutoAdvanceSettings())
+        }
     }
 
     private fun observeFeatureFlag() {
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 c6da3578c3..6600535bce 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
@@ -50,11 +50,13 @@ import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
 import com.infomaniak.mail.MatomoMail.trackThreadActionsEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.LocalSettings
+import com.infomaniak.mail.data.LocalSettings.AutoAdvanceMode
 import com.infomaniak.mail.data.LocalSettings.ExternalContent
 import com.infomaniak.mail.data.api.ApiRoutes
 import com.infomaniak.mail.data.models.Folder.FolderRole
 import com.infomaniak.mail.data.models.draft.Draft.DraftMode
 import com.infomaniak.mail.data.models.message.Message
+import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.databinding.FragmentThreadBinding
 import com.infomaniak.mail.ui.MainViewModel
 import com.infomaniak.mail.ui.alertDialogs.*
@@ -145,6 +147,7 @@ class ThreadFragment : Fragment() {
         observeCurrentFolderName()
 
         observeThreadOpening()
+        observeAutoAdvance()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -462,6 +465,10 @@ class ThreadFragment : Fragment() {
         }
     }
 
+    private fun observeAutoAdvance() {
+        mainViewModel.autoAdvanceThreadsUids.observe(viewLifecycleOwner, ::tryToAutoAdvance)
+    }
+
     private fun displayThreadView() = with(binding) {
         emptyView.isGone = true
         threadView.isVisible = true
@@ -621,6 +628,44 @@ class ThreadFragment : Fragment() {
         twoPaneViewModel.navArgs.value = NavData(resId, args)
     }
 
+    private fun tryToAutoAdvance(listThreadUids: List<String>) = with(twoPaneFragment.threadListAdapter) {
+        if (!listThreadUids.contains(openedThreadUid)) return@with
+
+        openedThreadPosition?.let {
+            val data = getNextThreadToOpenByPosition(it)
+
+            data?.let { (nextThread, index) ->
+                if (nextThread.uid != openedThreadUid && !nextThread.isOnlyOneDraft) {
+                    selectNewThread(newPosition = index, nextThread.uid)
+                }
+
+                twoPaneFragment.navigateToThread(nextThread)
+            } ?: run {
+                twoPaneViewModel.closeThread()
+            }
+        }
+    }
+
+    private fun getNextThreadToOpenByPosition(
+        startingThreadIndex: Int,
+    ): Pair<Thread, Int>? = with(twoPaneFragment.threadListAdapter) {
+
+        val direction = when (localSettings.autoAdvanceMode) {
+            AutoAdvanceMode.PREVIOUS_THREAD -> PREVIOUS_CHRONOLOGICAL_THREAD
+            AutoAdvanceMode.FOLLOWING_THREAD -> NEXT_CHRONOLOGICAL_THREAD
+            AutoAdvanceMode.THREADS_LIST -> null
+            AutoAdvanceMode.NATURAL_THREAD -> {
+                if (localSettings.autoAdvanceNaturalThread == AutoAdvanceMode.PREVIOUS_THREAD) {
+                    PREVIOUS_CHRONOLOGICAL_THREAD
+                } else {
+                    NEXT_CHRONOLOGICAL_THREAD
+                }
+            }
+        }
+
+        return direction?.let { getNextThread(startingThreadIndex, direction) }
+    }
+
     enum class HeaderState {
         ELEVATED,
         LOWERED,
@@ -630,6 +675,9 @@ class ThreadFragment : Fragment() {
         private const val COLLAPSE_TITLE_THRESHOLD = 0.5
         private const val ARCHIVE_INDEX = 2
 
+        private const val PREVIOUS_CHRONOLOGICAL_THREAD = -1
+        private const val NEXT_CHRONOLOGICAL_THREAD = 1
+
         private fun allAttachmentsFileName(subject: String) = "infomaniak-mail-attachments-$subject.zip"
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
index 702cc0a43e..949d0f1c78 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/SignatureAdapter.kt
@@ -22,7 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ListAdapter
-import com.infomaniak.lib.core.utils.context
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.signature.Signature
 import com.infomaniak.mail.databinding.ItemSignatureBinding
diff --git a/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
index 3d0a7ac19a..f5f4f09a9e 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/LocalStorageUtils.kt
@@ -114,7 +114,7 @@ object LocalStorageUtils {
             val attachmentsUploadDir = getAttachmentUploadDir(context, draftLocalUuid, attachmentLocalUuid)
             attachmentsUploadDir.mkdirs()
             val hashedFileName = "${uri.toString().substringAfter("document/").hashCode()}_$fileName"
-            
+
             return@use getFileToUpload(context, uri, snackbarManager, attachmentsUploadDir, hashedFileName, inputStream)
         } ?: run {
             Sentry.withScope { scope ->
diff --git a/app/src/main/java/com/infomaniak/mail/utils/Utils.kt b/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
index bf1817e2d8..f8bf194190 100644
--- a/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
+++ b/app/src/main/java/com/infomaniak/mail/utils/Utils.kt
@@ -98,7 +98,7 @@ object Utils {
             addSource(liveData2) { postIfInit() }
         }
     }
-    
+
     fun openShortcutHelp(context: Context) {
         ShortcutManagerCompat.reportShortcutUsed(context, Shortcuts.SUPPORT.id)
         context.openUrl(BuildConfig.CHATBOT_URL)
diff --git a/app/src/main/res/layout/fragment_auto_advance_settings.xml b/app/src/main/res/layout/fragment_auto_advance_settings.xml
new file mode 100644
index 0000000000..a4c7cf86f1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_auto_advance_settings.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Infomaniak Mail - Android
+  ~ Copyright (C) 2024 Infomaniak Network SA
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:title="@string/settingsAutoAdvanceTitle">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/SettingHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/settingsAutoAdvanceDescription" />
+
+            <com.infomaniak.mail.ui.main.settings.SettingRadioGroupView
+                android:id="@+id/radioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:ignoreDividers="true">
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/lastThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvancePreviousThreadTitle"
+                    app:value="lastThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/nextThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvanceFollowingThreadTitle"
+                    app:value="nextThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/listThread"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvanceListOfThreadsTitle"
+                    app:value="listThread" />
+
+                <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
+
+                <com.infomaniak.mail.ui.main.settings.SettingRadioButtonView
+                    android:id="@+id/lastAction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:text="@string/settingsAutoAdvanceNaturalThreadTitle"
+                    app:value="lastAction" />
+
+                <TextView
+                    android:id="@+id/descriptionLastAction"
+                    style="@style/BodySmall.Tertiary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="@dimen/marginStandardMedium"
+                    android:paddingEnd="@dimen/marginStandardMedium"
+                    android:text="@string/settingsAutoAdvanceNaturalThreadHint" />
+
+            </com.infomaniak.mail.ui.main.settings.SettingRadioGroupView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index feea381108..b5ce44e272 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -102,6 +102,14 @@
                 app:title="@string/settingsExternalContentTitle"
                 tools:subtitle="@string/settingsOptionAskMe" />
 
+            <com.infomaniak.mail.ui.main.settings.ItemSettingView
+                android:id="@+id/settingsAutomaticAdvance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:itemAction="chevron"
+                app:title="@string/settingsAutoAdvanceTitle"
+                tools:subtitle="@string/settingsAutoAdvanceListOfThreadsDescription" />
+
             <com.google.android.material.divider.MaterialDivider style="@style/ItemDivider" />
 
             <TextView
diff --git a/app/src/main/res/navigation/main_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
index ee348c703f..5ee795898f 100644
--- a/app/src/main/res/navigation/main_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -295,6 +295,9 @@
         <action
             android:id="@+id/action_settings_to_externalContentSetting"
             app:destination="@id/externalContentSettingFragment" />
+        <action
+            android:id="@+id/action_settings_to_autoAdvanceSettings"
+            app:destination="@id/autoAdvanceFragment" />
         <action
             android:id="@+id/action_settings_to_threadListDensitySetting"
             app:destination="@id/threadListDensitySettingFragment" />
@@ -315,6 +318,12 @@
             app:destination="@id/dataManagementSettingsFragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/autoAdvanceFragment"
+        android:name="com.infomaniak.mail.ui.main.settings.AutoAdvanceSettingsFragment"
+        android:label="AutoAdvanceSettingFragment"
+        tools:layout="@layout/fragment_auto_advance_settings" />
+
     <fragment
         android:id="@+id/mailboxSettingsFragment"
         android:name="com.infomaniak.mail.ui.main.settings.mailbox.MailboxSettingsFragment"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 580d7f4c93..285713e1dc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Wählen Sie Ihren Schreibassistent</string>
     <string name="settingsAppLock">App-Sperre</string>
     <string name="settingsAuthorizeTracking">Verfolgung genehmigen</string>
+    <string name="settingsAutoAdvanceDescription">Auswählen, was angezeigt werden soll, wenn eine Nachricht archiviert oder gelöscht wird</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Beim Archivieren oder Löschen folgenden Thread anzeigen</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Folgender Thread</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Liste der Threads beim Archivieren oder Löschen anzeigen</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Liste der Themen</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Wiederholt die letzte Aktion, die Sie durchgeführt haben</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Wählt automatisch die nächste oder vorherige Konversation aus, je nachdem, wie Sie zuletzt interagiert haben.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Wiederholung der letzten Aktion</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Vorheriges Thema beim Archivieren oder Löschen anzeigen</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Voriges Thema</string>
+    <string name="settingsAutoAdvanceTitle">Autovorschuss</string>
     <string name="settingsCancellationPeriodDescription">Sie haben die Möglichkeit, den Versand Ihrer E-Mail bis zu 30 Sekunden abzubrechen</string>
     <string name="settingsCancellationPeriodTitle">Kündigungsfrist senden</string>
     <string name="settingsDataManagementDescription">Sie können die Nutzungs- und Betriebsdaten, die Infomaniak abruft, individuell anpassen, um Fehler zu beheben und die Anwendung zu verbessern. Beide Tools werden ausschliesslich von uns gehostet und verwaltet.\n\nInfomaniak respektiert Ihre Privatsphäre: Der Quellcode dieser Anwendung kann überprüft werden, die gesammelten Informationen sind anonym und Ihre persönlichen Daten werden streng vertraulich behandelt und niemals an Dritte weitergegeben.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 60911cdd56..7f1934fdcd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Seleccione su asistente de redacción</string>
     <string name="settingsAppLock">Bloqueo de aplicaciones</string>
     <string name="settingsAuthorizeTracking">Autorizar el seguimiento</string>
+    <string name="settingsAutoAdvanceDescription">Seleccione qué mostrar cuando se archiva o elimina un mensaje</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Mostrar la siguiente conversación al archivar o borrar</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Conversación siguiente</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Mostrar la lista de conversaciones al archivar o borrar</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Lista de conversaciones</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Repite la última acción realizada</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Selecciona automáticamente la conversación siguiente o anterior, en función de tu última interacción.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Repetir la última acción</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Mostrar la conversación anterior al archivar o borrar</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Conversación anterior</string>
+    <string name="settingsAutoAdvanceTitle">Avance automático</string>
     <string name="settingsCancellationPeriodDescription">Tiene la posibilidad de cancelar el envío de su correo electrónico hasta 30 segundos</string>
     <string name="settingsCancellationPeriodTitle">Enviar plazo de anulación</string>
     <string name="settingsDataManagementDescription">Puede personalizar los datos de uso y funcionamiento que Infomaniak recupera para corregir errores y mejorar la aplicación. Ambas herramientas están alojadas y gestionadas exclusivamente por nosotros.\n\nInfomaniak respeta su privacidad: el código fuente de esta aplicación puede verificarse, la información recopilada es anónima y sus datos personales permanecen estrictamente confidenciales y nunca se comparten con terceros.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b7ddb520b5..e715a35db8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -400,6 +400,17 @@
     <string name="settingsAiEngineDescription">Sélectionnez votre assistant à la rédaction</string>
     <string name="settingsAppLock">Verrouillage de l’application</string>
     <string name="settingsAuthorizeTracking">Autoriser le suivi</string>
+    <string name="settingsAutoAdvanceDescription">Sélectionnez ce que vous souhaitez afficher lorsqu’un message est archivé ou supprimé</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Afficher la conversation suivante après archivage ou suppression</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Conversation suivante</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Afficher la liste des conversations après archivage ou suppression</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Liste des conversations</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Répète la dernière action que vous avez effectuée</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Sélectionne automatiquement la conversation suivante ou précédente, selon votre dernière interaction.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Répéter la dernière action</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Afficher la conversation précédente après archivage ou suppression</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Conversation précédente</string>
+    <string name="settingsAutoAdvanceTitle">Avance automatique</string>
     <string name="settingsCancellationPeriodDescription">Vous avez la possibilité d’annuler l’envoi de votre e-mail jusqu’à 30 secondes</string>
     <string name="settingsCancellationPeriodTitle">Délai d’annulation d’envoi</string>
     <string name="settingsDataManagementDescription">Vous pouvez personnaliser les données d’utilisation et opérationnelles qui sont récupérées par Infomaniak pour corriger des bugs et faire évoluer l’application. Les deux outils utilisés sont hébergés et gérés exclusivement chez nous.\n\nInfomaniak respecte votre vie privée : le code source de cette application peut être vérifié, les informations récoltées sont anonymes et vos informations personnelles restent strictement confidentielles et ne sont jamais partagées avec des tiers.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 849f85daeb..2b9d792033 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -392,6 +392,17 @@
     <string name="settingsAiEngineDescription">Selezionare l’assistente di scrittura</string>
     <string name="settingsAppLock">Blocco dell’app</string>
     <string name="settingsAuthorizeTracking">Autorizza il tracciamento</string>
+    <string name="settingsAutoAdvanceDescription">Selezionare cosa visualizzare quando un messaggio viene archiviato o eliminato</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Visualizza la seguente discussione quando si archivia o si elimina</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Seguendo il filo conduttore</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Visualizzazione dell’elenco delle discussioni durante l’archiviazione o la cancellazione</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">Elenco delle discussioni</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Ripete l’ultima azione eseguita</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Seleziona automaticamente la conversazione successiva o precedente, a seconda dell’ultima interazione.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Ripetere l’ultima azione</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Visualizzazione della discussione precedente quando si archivia o si elimina</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Filo conduttore precedente</string>
+    <string name="settingsAutoAdvanceTitle">Anticipo auto</string>
     <string name="settingsCancellationPeriodDescription">Avete la possibilità di annullare l’invio della vostra email fino a 30 secondi.</string>
     <string name="settingsCancellationPeriodTitle">Periodo di cancellazione dell’invio</string>
     <string name="settingsDataManagementDescription">È possibile personalizzare i dati di utilizzo e operativi che Infomaniak recupera per correggere i bug e migliorare l’applicazione. Entrambi gli strumenti sono ospitati e gestiti esclusivamente da noi.\n\nInfomaniak rispetta la vostra privacy: il codice sorgente di questa applicazione può essere verificato, le informazioni raccolte sono anonime e i vostri dati personali rimangono strettamente confidenziali e non vengono mai condivisi con terze parti.</string>
@@ -405,7 +416,7 @@
     <string name="settingsDisabled">Disabili</string>
     <string name="settingsEnabled">Abilitato</string>
     <string name="settingsExternalContentDescription">Visualizzare il contenuto esterno</string>
-    <string name="settingsExternalContentTitle">contenuto esterno</string>
+    <string name="settingsExternalContentTitle">Contenuto esterno</string>
     <string name="settingsInboxAlias">Alias</string>
     <string name="settingsInboxRedirect">Reindirizzamenti</string>
     <string name="settingsInboxRules">Regole</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e8b9428d39..8b01cf53c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,6 +398,17 @@
     <string name="settingsAiEngineDescription">Select your AI writing assistant</string>
     <string name="settingsAppLock">App lock</string>
     <string name="settingsAuthorizeTracking">Authorize tracking</string>
+    <string name="settingsAutoAdvanceDescription">Select what to display when a message is archived or deleted</string>
+    <string name="settingsAutoAdvanceFollowingThreadDescription">Display following thread when archiving or deleting</string>
+    <string name="settingsAutoAdvanceFollowingThreadTitle">Following thread</string>
+    <string name="settingsAutoAdvanceListOfThreadsDescription">Display the list of threads when archiving or deleting</string>
+    <string name="settingsAutoAdvanceListOfThreadsTitle">List of threads</string>
+    <string name="settingsAutoAdvanceNaturalThreadDescription">Repeats the last action you performed</string>
+    <string name="settingsAutoAdvanceNaturalThreadHint">Automatically selects the next or previous thread, depending on your last interaction.</string>
+    <string name="settingsAutoAdvanceNaturalThreadTitle">Repeat last action</string>
+    <string name="settingsAutoAdvancePreviousThreadDescription">Display previous thread when archiving or deleting</string>
+    <string name="settingsAutoAdvancePreviousThreadTitle">Previous thread</string>
+    <string name="settingsAutoAdvanceTitle">Auto advance</string>
     <string name="settingsCancellationPeriodDescription">You have the possibility to cancel the sending of your email up to 30 seconds</string>
     <string name="settingsCancellationPeriodTitle">Send cancellation period</string>
     <string name="settingsDataManagementDescription">You can customize the usage and operational data that Infomaniak retrieves to correct bugs and enhance the application. Both tools are hosted and managed exclusively by us.\n\nInfomaniak respects your privacy: the source code of this application can be verified, the information collected is anonymous and your personal information remains strictly confidential and is never shared with third parties.</string>