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 694ff7de86..c05a3797a6 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
@@ -67,6 +67,7 @@ import com.infomaniak.mail.ui.MainActivity
 import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
 import com.infomaniak.mail.ui.alertDialogs.TitleAlertDialog
 import com.infomaniak.mail.ui.main.SnackbarManager
+import com.infomaniak.mail.ui.main.folder.ThreadListViewModel.ContentDisplayMode
 import com.infomaniak.mail.ui.main.settings.appearance.swipe.SwipeActionsSettingsFragment
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
 import com.infomaniak.mail.ui.newMessage.NewMessageActivityArgs
@@ -80,8 +81,6 @@ import com.infomaniak.mail.utils.Utils.isPermanentDeleteFolder
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import com.infomaniak.mail.utils.extensions.*
 import dagger.hilt.android.AndroidEntryPoint
-import io.sentry.Sentry
-import io.sentry.SentryLevel
 import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
@@ -164,6 +163,7 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         observeUpdateInstall()
         observeWebViewOutdated()
         observeLoadMoreTriggers()
+        observeContentDisplayMode()
     }.getOrDefault(Unit)
 
     @ColorRes
@@ -706,46 +706,60 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
 
     private fun updateThreadsVisibility() = with(threadListViewModel) {
 
-        fun displayThreadsView(
-            areThereThreads: Boolean,
-            isFilterEnabled: Boolean,
-            isBooting: Boolean,
-            isWaitingFirstThreads: Boolean,
-        ) {
+        val isNetworkConnected = mainViewModel.hasNetwork
 
-            with(binding) {
-                emptyStateView.isGone = true
-                threadsList.isVisible = true
-            }
+        // The folder's cursor is null, meaning it's the 1st time we are opening this folder.
+        val isCursorNull = currentFolderCursor == null
 
-            if (!areThereThreads && !isFilterEnabled && !isBooting && !isWaitingFirstThreads) {
-                val currentFolder = mainViewModel.currentFolder.value
-                Sentry.captureMessage(
-                    "Should display threads is true but there are no threads to display",
-                    SentryLevel.WARNING,
-                ) { scope ->
-                    scope.setExtra("cursor", "$currentFolderCursor")
-                    scope.setExtra("folderRole", currentFolder?.role?.name.toString())
-                    scope.setExtra("folderThreadsCount", "${currentFolder?.threads?.count()}")
-                }
-            }
-        }
+        // We have a cursor, but don't have any info about threads yet, meaning the app is still booting and loading things.
+        val isBooting = !isCursorNull && currentThreadsCount == null
 
-        val areThereThreads = (currentThreadsCount ?: 0) > 0
+        // We know that there is existing threads in this folder, so if we wait long enough, they'll be there.
+        val areThereThreadsSoon = mainViewModel.currentFolderLive.value?.oldMessagesUidsToFetch?.isNotEmpty() == true
+
+        // If there is network connectivity, but we either don't have a cursor yet
+        // or don't have threads yet (but we know that they are coming), it means
+        // we are opening this folder for the 1st time and we know we'll have a result at the end.
+        val isWaitingFirstThreads = (isCursorNull || areThereThreadsSoon) && isNetworkConnected
+
+        // There is at least 1 thread available to be displayed right now.
+        val areThereThreadsNow = (currentThreadsCount ?: 0) > 0
+
+        // If we filtered on something, it means we have threads, so we want to display the Threads display mode.
         val isFilterEnabled = mainViewModel.currentFilter.value != ThreadFilter.ALL
-        val isCursorNull = currentFolderCursor == null
-        val isNetworkConnected = mainViewModel.hasNetwork
-        val isBooting = currentThreadsCount == null && !isCursorNull && isNetworkConnected
-        val isWaitingFirstThreads = isCursorNull && isNetworkConnected
-        val shouldDisplayThreadsView = isBooting || isWaitingFirstThreads || areThereThreads || isFilterEnabled
 
-        when {
-            shouldDisplayThreadsView -> displayThreadsView(areThereThreads, isFilterEnabled, isBooting, isWaitingFirstThreads)
-            isCursorNull || !isNetworkConnected -> setEmptyState(EmptyState.NETWORK)
-            isCurrentFolderRole(FolderRole.INBOX) -> setEmptyState(EmptyState.INBOX)
-            isCurrentFolderRole(FolderRole.TRASH) -> setEmptyState(EmptyState.TRASH)
-            else -> setEmptyState(EmptyState.FOLDER)
+        // If any of these conditions is true, it means Threads are on their way or the
+        // app is still loading things, so either way we want to display the Threads mode.
+        val shouldDisplayThreadsView = isBooting || isWaitingFirstThreads || areThereThreadsNow || isFilterEnabled
+
+        contentDisplayMode.value = when {
+            shouldDisplayThreadsView -> ContentDisplayMode.Threads
+            !isNetworkConnected -> ContentDisplayMode.NoNetwork
+            else -> ContentDisplayMode.EmptyFolder
+        }
+    }
+
+    private fun observeContentDisplayMode() {
+
+        fun folderEmptyState() = when {
+            isCurrentFolderRole(FolderRole.INBOX) -> EmptyState.INBOX
+            isCurrentFolderRole(FolderRole.TRASH) -> EmptyState.TRASH
+            else -> EmptyState.FOLDER
         }
+
+        threadListViewModel.contentDisplayMode
+            .observe(viewLifecycleOwner) {
+                when (it) {
+                    ContentDisplayMode.Threads, null -> displayThreadsView()
+                    ContentDisplayMode.NoNetwork -> setEmptyState(EmptyState.NETWORK)
+                    ContentDisplayMode.EmptyFolder -> setEmptyState(folderEmptyState())
+                }
+            }
+    }
+
+    private fun displayThreadsView() = with(binding) {
+        emptyStateView.isGone = true
+        threadsList.isVisible = true
     }
 
     private fun setEmptyState(emptyState: EmptyState): Unit = with(binding) {
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListViewModel.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListViewModel.kt
index 0389ca3f8d..bb21a8234d 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListViewModel.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListViewModel.kt
@@ -46,6 +46,8 @@ class ThreadListViewModel @Inject constructor(
     val updatedAtTrigger = MutableLiveData<Unit>()
     val isWebViewOutdated = MutableLiveData(false)
 
+    val contentDisplayMode = MutableLiveData(ContentDisplayMode.Threads)
+
     var currentFolderCursor: String? = null
     var currentThreadsCount: Int? = null
 
@@ -84,6 +86,12 @@ class ThreadListViewModel @Inject constructor(
         isWebViewOutdated.value = canShowWebViewOutdated && hasOutdatedMajorVersion
     }
 
+    enum class ContentDisplayMode {
+        Threads,
+        NoNetwork,
+        EmptyFolder,
+    }
+
     companion object {
         private const val WEBVIEW_OFFICIAL_PACKAGE_NAME = "com.google.android.webview"
         private const val WEBVIEW_OFFICIAL_MIN_VERSION = 124
diff --git a/app/src/main/res/layout/fragment_thread_list.xml b/app/src/main/res/layout/fragment_thread_list.xml
index 814fa58137..694a1b38bd 100644
--- a/app/src/main/res/layout/fragment_thread_list.xml
+++ b/app/src/main/res/layout/fragment_thread_list.xml
@@ -232,8 +232,7 @@
                                 android:clipToPadding="false"
                                 android:paddingBottom="@dimen/recyclerViewPaddingBottom"
                                 app:behind_swiped_item_icon_margin="@dimen/marginStandard"
-                                tools:listitem="@layout/cardview_thread_item"
-                                tools:visibility="visible" />
+                                tools:listitem="@layout/cardview_thread_item" />
 
                         </LinearLayout>