diff --git a/lib/features/home/domain/extensions/session_extensions.dart b/lib/features/home/domain/extensions/session_extensions.dart
index 8b4e4edf5..7985834d3 100644
--- a/lib/features/home/domain/extensions/session_extensions.dart
+++ b/lib/features/home/domain/extensions/session_extensions.dart
@@ -95,6 +95,10 @@ extension SessionExtensions on Session {
 
   ContactSupportCapability? getContactSupportCapability(AccountId accountId) {
     try {
+      if (!linagoraContactSupportCapability.isSupported(this, accountId)) {
+        return null;
+      }
+
       final contactSupportCapability = getCapabilityProperties<ContactSupportCapability>(
         accountId,
         linagoraContactSupportCapability,
@@ -118,6 +122,11 @@ extension SessionExtensions on Session {
 
   DownloadAllCapability? getDownloadAllCapability(AccountId? accountId) {
     if (accountId == null) return null;
+
+    if (!linagoraDownloadAllCapability.isSupported(this, accountId)) {
+      return null;
+    }
+
     return getCapabilityProperties<DownloadAllCapability>(
       accountId,
       linagoraDownloadAllCapability,
@@ -157,6 +166,10 @@ extension SessionExtensions on Session {
 
   SaaSAccountCapability? getSaaSAccountCapability(AccountId accountId) {
     try {
+      if (!linagoraSaaSCapability.isSupported(this, accountId)) {
+        return null;
+      }
+
       final saaSAccountCapability = getCapabilityProperties<SaaSAccountCapability>(
         accountId,
         linagoraSaaSCapability,
diff --git a/lib/features/manage_account/presentation/preferences/preferences_view.dart b/lib/features/manage_account/presentation/preferences/preferences_view.dart
index 3cc7bdca3..aaf93231c 100644
--- a/lib/features/manage_account/presentation/preferences/preferences_view.dart
+++ b/lib/features/manage_account/presentation/preferences/preferences_view.dart
@@ -1,4 +1,3 @@
-import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index 102ec9f8b..d61cb3db5 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -677,15 +677,12 @@ class SearchEmailView extends GetWidget<SearchEmailController>
           ),
           separatorBuilder: (context, index) {
             final isMobile = PlatformInfo.isMobile;
-            final isLastItem = index == listPresentationEmail.length - 1;
             final isInactive =
                 controller.selectionMode.value == SelectMode.INACTIVE;
 
-            final showDivider = !isLastItem;
-
             final dividerColor = isMobile
                 ? null
-                : (showDivider && isInactive ? null : Colors.white);
+                : (isInactive ? null : Colors.white);
 
             final padding = isMobile
                 ? SearchEmailUtils.getPaddingItemListMobile(
@@ -697,10 +694,6 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                     controller.responsiveUtils,
                   );
 
-            if (!showDivider) {
-              return const SizedBox.shrink();
-            }
-
             return Padding(
               padding: padding,
               child: Divider(color: dividerColor),