diff --git a/lib/features/email/presentation/email_bindings.dart b/lib/features/email/presentation/email_bindings.dart
new file mode 100644
index 000000000..a6a41bfe7
--- /dev/null
+++ b/lib/features/email/presentation/email_bindings.dart
@@ -0,0 +1,10 @@
+import 'package:core/presentation/utils/responsive_utils.dart';
+import 'package:get/get.dart';
+import 'package:tmail_ui_user/features/email/presentation/email_controller.dart';
+
+class EmailBindings extends Bindings {
+  @override
+  void dependencies() {
+    Get.lazyPut(() => EmailController(Get.find<ResponsiveUtils>()));
+  }
+}
\ No newline at end of file
diff --git a/lib/features/mail/presentation/mail_controller.dart b/lib/features/email/presentation/email_controller.dart
similarity index 83%
rename from lib/features/mail/presentation/mail_controller.dart
rename to lib/features/email/presentation/email_controller.dart
index a99ad1927..81050cd0d 100644
--- a/lib/features/mail/presentation/mail_controller.dart
+++ b/lib/features/email/presentation/email_controller.dart
@@ -4,11 +4,11 @@ import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
 
-class MailController extends BaseController {
+class EmailController extends BaseController {
 
   final ResponsiveUtils responsiveUtils;
 
-  MailController(this.responsiveUtils);
+  EmailController(this.responsiveUtils);
 
   @override
   void onReady() {
diff --git a/lib/features/mail/presentation/mail_view.dart b/lib/features/email/presentation/email_view.dart
similarity index 87%
rename from lib/features/mail/presentation/mail_view.dart
rename to lib/features/email/presentation/email_view.dart
index 45223eb7e..db9c3c93f 100644
--- a/lib/features/mail/presentation/mail_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -2,13 +2,13 @@ import 'package:core/core.dart';
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:tmail_ui_user/features/mail/presentation/mail_controller.dart';
-import 'package:tmail_ui_user/features/mail/presentation/widgets/app_bar_mail_widget_builder.dart';
-import 'package:tmail_ui_user/features/mail/presentation/widgets/bottom_bar_mail_widget_builder.dart';
+import 'package:tmail_ui_user/features/email/presentation/email_controller.dart';
+import 'package:tmail_ui_user/features/email/presentation/widgets/app_bar_mail_widget_builder.dart';
+import 'package:tmail_ui_user/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
-class MailView extends GetWidget<MailController> {
+class EmailView extends GetWidget<EmailController> {
 
   final mailboxDashBoardController = Get.find<MailboxDashBoardController>();
   final responsiveUtils = Get.find<ResponsiveUtils>();
diff --git a/lib/features/mail/presentation/widgets/app_bar_mail_widget_builder.dart b/lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart
similarity index 100%
rename from lib/features/mail/presentation/widgets/app_bar_mail_widget_builder.dart
rename to lib/features/email/presentation/widgets/app_bar_mail_widget_builder.dart
diff --git a/lib/features/mail/presentation/widgets/bottom_bar_mail_widget_builder.dart b/lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart
similarity index 100%
rename from lib/features/mail/presentation/widgets/bottom_bar_mail_widget_builder.dart
rename to lib/features/email/presentation/widgets/bottom_bar_mail_widget_builder.dart
diff --git a/lib/features/mail/presentation/mail_bindings.dart b/lib/features/mail/presentation/mail_bindings.dart
deleted file mode 100644
index b8bab5ff6..000000000
--- a/lib/features/mail/presentation/mail_bindings.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:core/presentation/utils/responsive_utils.dart';
-import 'package:get/get.dart';
-import 'package:tmail_ui_user/features/mail/presentation/mail_controller.dart';
-
-class MailBindings extends Bindings {
-  @override
-  void dependencies() {
-    Get.lazyPut(() => MailController(Get.find<ResponsiveUtils>()));
-  }
-}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
index 92d6b8984..65703814a 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view.dart
@@ -2,7 +2,7 @@ import 'package:core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:tmail_ui_user/features/mail/presentation/mail_view.dart';
+import 'package:tmail_ui_user/features/email/presentation/email_view.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/thread/presentation/thread_view.dart';
@@ -33,7 +33,7 @@ class MailboxDashBoardView extends GetWidget<MailboxDashBoardController> {
               flex: responsiveUtils.isDesktop(context) ? 1 : 3,
               child: ThreadView(),
             ),
-            if (responsiveUtils.isDesktop(context)) Expanded(flex: 2, child: MailView()),
+            if (responsiveUtils.isDesktop(context)) Expanded(flex: 2, child: EmailView()),
           ],
         ),
       ),
diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart
index aa3f79daa..de48b24ad 100644
--- a/lib/features/thread/presentation/thread_controller.dart
+++ b/lib/features/thread/presentation/thread_controller.dart
@@ -43,7 +43,7 @@ class ThreadController extends BaseController {
   }
 
   void goToMail(BuildContext context) {
-    Get.toNamed(AppRoutes.MAIL);
+    Get.toNamed(AppRoutes.EMAIL);
   }
 
   @override
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index da5456fae..538b20e96 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -117,7 +117,7 @@ class AppLocalizations {
 
   String get no_mail_selected {
     return Intl.message(
-      'No mail selected',
+      'No email selected',
       name: 'no_mail_selected',
     );
   }
diff --git a/lib/main/pages/app_pages.dart b/lib/main/pages/app_pages.dart
index d0f3128ba..b34bfa8b3 100644
--- a/lib/main/pages/app_pages.dart
+++ b/lib/main/pages/app_pages.dart
@@ -3,8 +3,8 @@ import 'package:tmail_ui_user/features/home/presentation/home_bindings.dart';
 import 'package:tmail_ui_user/features/home/presentation/home_view.dart';
 import 'package:tmail_ui_user/features/login/presentation/login_bindings.dart';
 import 'package:tmail_ui_user/features/login/presentation/login_view.dart';
-import 'package:tmail_ui_user/features/mail/presentation/mail_bindings.dart';
-import 'package:tmail_ui_user/features/mail/presentation/mail_view.dart';
+import 'package:tmail_ui_user/features/email/presentation/email_bindings.dart';
+import 'package:tmail_ui_user/features/email/presentation/email_view.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_bindings.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mailbox_dashboard_bindings.dart';
@@ -42,8 +42,8 @@ class AppPages {
       page: () => ThreadView(),
       binding: ThreadBindings()),
     GetPage(
-      name: AppRoutes.MAIL,
-      page: () => MailView(),
-      binding: MailBindings()),
+      name: AppRoutes.EMAIL,
+      page: () => EmailView(),
+      binding: EmailBindings()),
   ];
 }
diff --git a/lib/main/routes/app_routes.dart b/lib/main/routes/app_routes.dart
index f5b4d59e7..e1df10406 100644
--- a/lib/main/routes/app_routes.dart
+++ b/lib/main/routes/app_routes.dart
@@ -4,6 +4,6 @@ abstract class AppRoutes {
   static const MAILBOX = '$MAILBOX_DASHBOARD/mailbox';
   static const MAILBOX_DASHBOARD = '/mailboxDashBoard';
   static const THREAD = '$MAILBOX_DASHBOARD/thread';
-  static const MAIL = '$THREAD/mail';
+  static const EMAIL = '$THREAD/email';
   static const SESSION = '/session';
 }
\ No newline at end of file
diff --git a/model/lib/mail/presentation_thread.dart b/model/lib/email/presentation_email.dart
similarity index 100%
rename from model/lib/mail/presentation_thread.dart
rename to model/lib/email/presentation_email.dart
diff --git a/model/lib/model.dart b/model/lib/model.dart
index 461b33a12..89e73417f 100644
--- a/model/lib/model.dart
+++ b/model/lib/model.dart
@@ -13,5 +13,5 @@ export 'mailbox/presentation_mailbox.dart';
 export 'mailbox/select_mode.dart';
 export 'mailbox/expand_mode.dart';
 
-// Mail
-export 'mail/presentation_thread.dart';
+// Email
+export 'email/presentation_email.dart';