diff --git a/lib/features/destination_picker/presentation/destination_picker_controller.dart b/lib/features/destination_picker/presentation/destination_picker_controller.dart
index d3e2dcc20..ca4e530d8 100644
--- a/lib/features/destination_picker/presentation/destination_picker_controller.dart
+++ b/lib/features/destination_picker/presentation/destination_picker_controller.dart
@@ -177,15 +177,26 @@ class DestinationPickerController extends BaseMailboxController {
   void toggleMailboxCategories(MailboxCategories categories) {
     switch(categories) {
       case MailboxCategories.exchange:
-        final newExpandMode = mailboxCategoriesExpandMode.value.defaultMailbox == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
+        final newExpandMode = mailboxCategoriesExpandMode.value.defaultMailbox == ExpandMode.EXPAND
+          ? ExpandMode.COLLAPSE
+          : ExpandMode.EXPAND;
         mailboxCategoriesExpandMode.value.defaultMailbox = newExpandMode;
         mailboxCategoriesExpandMode.refresh();
         break;
       case MailboxCategories.personalMailboxes:
-        final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND ? ExpandMode.COLLAPSE : ExpandMode.EXPAND;
+        final newExpandMode = mailboxCategoriesExpandMode.value.personalMailboxes == ExpandMode.EXPAND
+          ? ExpandMode.COLLAPSE
+          : ExpandMode.EXPAND;
         mailboxCategoriesExpandMode.value.personalMailboxes = newExpandMode;
         mailboxCategoriesExpandMode.refresh();
         break;
+      case MailboxCategories.teamMailboxes:
+        final newExpandMode = mailboxCategoriesExpandMode.value.teamMailboxes == ExpandMode.EXPAND
+          ? ExpandMode.COLLAPSE
+          : ExpandMode.EXPAND;
+        mailboxCategoriesExpandMode.value.teamMailboxes = newExpandMode;
+        mailboxCategoriesExpandMode.refresh();
+        break;
       default:
         return;
     }
@@ -280,10 +291,11 @@ class DestinationPickerController extends BaseMailboxController {
 
   void searchMailbox(String value) {
     searchQuery.value = SearchQuery(value);
-    _searchMailboxAction(
-      allMailboxes.listPersonalMailboxes,
-      searchQuery.value
-    );
+    final searchableMailboxList = mailboxAction.value == MailboxActions.moveEmail
+      ? allMailboxes
+      : allMailboxes.listPersonalMailboxes;
+
+    _searchMailboxAction(searchableMailboxList, searchQuery.value);
   }
 
   void _searchMailboxAction(List<PresentationMailbox> allMailboxes, SearchQuery searchQuery) {
diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart
index 2dc628b26..987d113f0 100644
--- a/lib/features/destination_picker/presentation/destination_picker_view.dart
+++ b/lib/features/destination_picker/presentation/destination_picker_view.dart
@@ -251,6 +251,31 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
               return const SizedBox.shrink();
             }
           }),
+          Obx(() {
+            if (controller.teamMailboxesIsNotEmpty
+                && controller.mailboxAction.value == MailboxActions.moveEmail) {
+              return Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  const Divider(
+                    color: AppColor.colorDividerMailbox,
+                    height: 0.5,
+                    thickness: 0.2
+                  ),
+                  const SizedBox(height: 8),
+                  _buildMailboxCategory(
+                    context,
+                    MailboxCategories.teamMailboxes,
+                    controller.teamMailboxesRootNode,
+                    actions,
+                    mailboxIdSelected
+                  )
+                ]
+              );
+            } else {
+              return const SizedBox.shrink();
+            }
+          }),
           const SizedBox(height: 12)
         ])
     );