diff --git a/core/lib/presentation/utils/style_utils.dart b/core/lib/presentation/utils/style_utils.dart
index f9fd44ba7..585bfb308 100644
--- a/core/lib/presentation/utils/style_utils.dart
+++ b/core/lib/presentation/utils/style_utils.dart
@@ -12,4 +12,6 @@ class CommonTextStyle {
   static final defaultTextOverFlow = BuildUtils.isWeb
       ? TextOverflow.fade
       : TextOverflow.ellipsis;
+
+  static final defaultSoftWrap = BuildUtils.isWeb ? false : true;
 }
\ No newline at end of file
diff --git a/core/lib/presentation/views/button/button_builder.dart b/core/lib/presentation/views/button/button_builder.dart
index c8f2ad1bb..c7aa597bf 100644
--- a/core/lib/presentation/views/button/button_builder.dart
+++ b/core/lib/presentation/views/button/button_builder.dart
@@ -150,6 +150,7 @@ class ButtonBuilder {
     return Text(
       '${_text ?? ''}',
       maxLines: 1,
+      softWrap: CommonTextStyle.defaultSoftWrap,
       overflow: CommonTextStyle.defaultTextOverFlow,
       style: _textStyle ?? TextStyle(fontSize: 12, color: AppColor.colorTextButton),
     );
diff --git a/core/lib/presentation/views/text/rich_text_builder.dart b/core/lib/presentation/views/text/rich_text_builder.dart
index f4b49180c..7c4c2f2a1 100644
--- a/core/lib/presentation/views/text/rich_text_builder.dart
+++ b/core/lib/presentation/views/text/rich_text_builder.dart
@@ -1,3 +1,4 @@
+import 'package:core/presentation/utils/style_utils.dart';
 import 'package:flutter/material.dart';
 
 class RichTextBuilder {
@@ -34,7 +35,8 @@ class RichTextBuilder {
     return RichText(
       key: _key,
       maxLines: _maxLines ?? 1,
-      overflow: _overflow ?? TextOverflow.ellipsis,
+      softWrap: CommonTextStyle.defaultSoftWrap,
+      overflow: _overflow ?? CommonTextStyle.defaultTextOverFlow,
       text: TextSpan(
         style: _styleOrigin,
         children: _getSpans(_textOrigin, _wordToStyle, _styleWord)));
diff --git a/lib/features/base/widget/drop_down_button_widget.dart b/lib/features/base/widget/drop_down_button_widget.dart
index 29a01c03a..47de5d9a3 100644
--- a/lib/features/base/widget/drop_down_button_widget.dart
+++ b/lib/features/base/widget/drop_down_button_widget.dart
@@ -63,6 +63,7 @@ class DropDownButtonWidget<T> extends StatelessWidget {
                         fontWeight: FontWeight.normal,
                         color: Colors.black.withOpacity(opacity)),
                     maxLines: 1,
+                    softWrap: CommonTextStyle.defaultSoftWrap,
                     overflow: CommonTextStyle.defaultTextOverFlow,
                   )),
                 ])
@@ -81,6 +82,7 @@ class DropDownButtonWidget<T> extends StatelessWidget {
                                 fontWeight: FontWeight.normal,
                                 color: Colors.black),
                             maxLines: 1,
+                            softWrap: CommonTextStyle.defaultSoftWrap,
                             overflow: CommonTextStyle.defaultTextOverFlow,
                           )),
                           if (supportSelectionIcon && item == itemSelected)
@@ -115,6 +117,7 @@ class DropDownButtonWidget<T> extends StatelessWidget {
                           fontWeight: FontWeight.normal,
                           color: Colors.black.withOpacity(opacity)),
                       maxLines: 1,
+                      softWrap: CommonTextStyle.defaultSoftWrap,
                       overflow: CommonTextStyle.defaultTextOverFlow,
                     )),
                     iconArrowDown ?? SvgPicture.asset(_imagePaths.icDropDown)
diff --git a/lib/features/composer/presentation/widgets/attachment_file_composer_builder.dart b/lib/features/composer/presentation/widgets/attachment_file_composer_builder.dart
index 941338b1e..c09cc2547 100644
--- a/lib/features/composer/presentation/widgets/attachment_file_composer_builder.dart
+++ b/lib/features/composer/presentation/widgets/attachment_file_composer_builder.dart
@@ -70,6 +70,7 @@ class AttachmentFileComposerBuilder extends StatelessWidget with AppLoaderMixin
                     child: Text(
                       fileState.fileName,
                       maxLines: 1,
+                      softWrap: CommonTextStyle.defaultSoftWrap,
                       overflow: CommonTextStyle.defaultTextOverFlow,
                       style: const TextStyle(
                           fontSize: 14,
@@ -87,6 +88,7 @@ class AttachmentFileComposerBuilder extends StatelessWidget with AppLoaderMixin
                       child: Text(
                           filesize(fileState.fileSize),
                           maxLines: 1,
+                          softWrap: CommonTextStyle.defaultSoftWrap,
                           overflow: CommonTextStyle.defaultTextOverFlow,
                           style: const TextStyle(
                               fontSize: 12,
diff --git a/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart b/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart
index 28da3758f..06052a4af 100644
--- a/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart
+++ b/lib/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart
@@ -105,6 +105,7 @@ class DropDownMenuHeaderStyleWidget extends StatelessWidget {
             fontWeight: fontWeight,
             color: Colors.black),
         maxLines: 1,
+        softWrap: CommonTextStyle.defaultSoftWrap,
         overflow: CommonTextStyle.defaultTextOverFlow);
   }
 }
\ No newline at end of file
diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart
index f9dff11ba..f653ce96a 100644
--- a/lib/features/destination_picker/presentation/destination_picker_view.dart
+++ b/lib/features/destination_picker/presentation/destination_picker_view.dart
@@ -280,6 +280,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
         child: Row(children: [
           Expanded(child: Text(categories.getTitle(context),
               maxLines: 1,
+              softWrap: CommonTextStyle.defaultSoftWrap,
               overflow: CommonTextStyle.defaultTextOverFlow,
               style: const TextStyle(fontSize: 20, color: Colors.black, fontWeight: FontWeight.bold))),
           buildIconWeb(
@@ -406,6 +407,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
                 Expanded(child: Text(
                   AppLocalizations.of(context).allMailboxes,
                   maxLines: 1,
+                  softWrap: CommonTextStyle.defaultSoftWrap,
                   overflow: CommonTextStyle.defaultTextOverFlow,
                   style: const TextStyle(
                       fontSize: 15,
diff --git a/lib/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart b/lib/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart
index a0a440121..415d752b8 100644
--- a/lib/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart
+++ b/lib/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart
@@ -79,6 +79,7 @@ class AppBarDestinationPickerBuilder {
     return Text(
         _mailboxAction?.getTitle(_context) ?? '',
         maxLines: 1,
+        softWrap: CommonTextStyle.defaultSoftWrap,
         overflow: CommonTextStyle.defaultTextOverFlow,
         textAlign: TextAlign.center,
         style: const TextStyle(fontSize: 20, color: AppColor.colorNameEmail, fontWeight: FontWeight.w700));
diff --git a/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_web_builder.dart b/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_web_builder.dart
index aa7a59044..fd4b72f52 100644
--- a/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_web_builder.dart
+++ b/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_web_builder.dart
@@ -34,6 +34,7 @@ class TopBarDestinationPickerWebBuilder extends StatelessWidget {
               child: Text(
                 _mailboxAction?.getTitle(context) ?? '',
                 maxLines: 1,
+                  softWrap: CommonTextStyle.defaultSoftWrap,
                 overflow: CommonTextStyle.defaultTextOverFlow,
                 textAlign: TextAlign.center,
                 style: const TextStyle(
diff --git a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
index af1f4ec0f..354b8b001 100644
--- a/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
+++ b/lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
@@ -270,6 +270,7 @@ class MailBoxFolderTileBuilder {
     return Text(
       _mailboxNode.item.name?.name ?? '',
       maxLines: 1,
+      softWrap: CommonTextStyle.defaultSoftWrap,
       overflow: CommonTextStyle.defaultTextOverFlow,
       style: const TextStyle(
           fontSize: 15,
diff --git a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
index 5f0119b90..509752e35 100644
--- a/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
+++ b/lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
@@ -147,6 +147,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
                       Expanded(child: Obx(() => Text(
                         controller.selectedMailbox.value?.name?.name ?? AppLocalizations.of(context).default_mailbox,
                         maxLines: 1,
+                        softWrap: CommonTextStyle.defaultSoftWrap,
                         overflow: CommonTextStyle.defaultTextOverFlow,
                         style: TextStyle(
                             fontSize: 15,
diff --git a/lib/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart b/lib/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart
index a32611b49..facc065d7 100644
--- a/lib/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart
+++ b/lib/features/mailbox_creator/presentation/widgets/app_bar_mailbox_creator_builder.dart
@@ -87,6 +87,7 @@ class AppBarMailboxCreatorBuilder {
         title ?? '',
         textAlign: TextAlign.center,
         maxLines: 1,
+        softWrap: CommonTextStyle.defaultSoftWrap,
         overflow: CommonTextStyle.defaultTextOverFlow,
         style: const TextStyle(
             fontSize: 20,
diff --git a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
index 9536b4cec..267265a4a 100644
--- a/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
+++ b/lib/features/mailbox_dashboard/presentation/widgets/advanced_search/text_field_auto_complete_email_adress.dart
@@ -82,7 +82,7 @@ class _TextFieldAutoCompleteEmailAddressState
                   itemCount: listEmailAddress.length,
                   itemBuilder: (BuildContext context, int index) {
                     final emailAddress = listEmailAddress.elementAt(index);
-                    return GestureDetector(
+                    return InkWell(
                       onTap: () => onSelected(emailAddress),
                       child: _buildSuggestionItem(context, emailAddress),
                     );
@@ -204,6 +204,7 @@ class _TextFieldAutoCompleteEmailAddressState
               Text(
                   emailAddress.asString(),
                   maxLines: 1,
+                  softWrap: CommonTextStyle.defaultSoftWrap,
                   overflow: CommonTextStyle.defaultTextOverFlow,
                   style: const TextStyle(
                       color: Colors.black,
@@ -214,6 +215,7 @@ class _TextFieldAutoCompleteEmailAddressState
                 Text(
                     emailAddress.emailAddress,
                     maxLines: 1,
+                    softWrap: CommonTextStyle.defaultSoftWrap,
                     overflow: CommonTextStyle.defaultTextOverFlow,
                     style: const TextStyle(
                         color: AppColor.colorHintSearchBar,
diff --git a/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart b/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart
index 338a29190..008717cc1 100644
--- a/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart
+++ b/lib/features/thread/presentation/widgets/app_bar_thread_widget_builder.dart
@@ -379,6 +379,7 @@ class AppBarThreadWidgetBuilder {
               child: Text(
                 _currentMailbox?.name?.name.capitalizeFirstEach ?? '',
                 maxLines: 1,
+                softWrap: CommonTextStyle.defaultSoftWrap,
                 overflow: CommonTextStyle.defaultTextOverFlow,
                 style: const TextStyle(
                     fontSize: 21,
diff --git a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
index 1df721b65..554a6a34e 100644
--- a/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
+++ b/lib/features/thread/presentation/widgets/email_tile_web_builder.dart
@@ -145,11 +145,12 @@ class EmailTileBuilder {
                                   fontWeight: _buildFontForReadEmail())).build()
                           : Text(
                               _getInformationSender(),
-                              softWrap: false,
+                              softWrap: CommonTextStyle.defaultSoftWrap,
+                              overflow: CommonTextStyle.defaultTextOverFlow,
                               maxLines: 1,
                               style: TextStyle(
                                   fontSize: 15,
-                                  overflow: TextOverflow.fade,
+                                  overflow: CommonTextStyle.defaultTextOverFlow,
                                   color: _buildTextColorForReadEmail(),
                                   fontWeight: _buildFontForReadEmail()))
                   ),
@@ -168,6 +169,8 @@ class EmailTileBuilder {
                               .getReceivedAt(Localizations.localeOf(_context)
                               .toLanguageTag()),
                           maxLines: 1,
+                          softWrap: CommonTextStyle.defaultSoftWrap,
+                          overflow: CommonTextStyle.defaultTextOverFlow,
                           style: const TextStyle(
                               fontSize: 13,
                               color: AppColor.colorContentEmail))),
@@ -197,6 +200,8 @@ class EmailTileBuilder {
                         : Text(
                             _presentationEmail.getEmailTitle(),
                             maxLines: 1,
+                            softWrap: CommonTextStyle.defaultSoftWrap,
+                            overflow: CommonTextStyle.defaultTextOverFlow,
                             style: TextStyle(
                                 fontSize: 13,
                                 color: _buildTextColorForReadEmail()))
@@ -215,6 +220,8 @@ class EmailTileBuilder {
                           child: Text(
                             _presentationEmail.mailboxName,
                             maxLines: 1,
+                            softWrap: CommonTextStyle.defaultSoftWrap,
+                            overflow: CommonTextStyle.defaultTextOverFlow,
                             style: const TextStyle(
                                 fontSize: 10,
                                 color: AppColor.mailboxTextColor,
@@ -247,6 +254,8 @@ class EmailTileBuilder {
                       : Text(
                           _presentationEmail.getPartialContent(),
                           maxLines: 1,
+                          softWrap: CommonTextStyle.defaultSoftWrap,
+                          overflow: CommonTextStyle.defaultTextOverFlow,
                           style: const TextStyle(
                               fontSize: 13,
                               color: AppColor.colorContentEmail))
@@ -318,11 +327,12 @@ class EmailTileBuilder {
                                     fontWeight: _buildFontForReadEmail())).build()
                             : Text(
                                 _getInformationSender(),
-                                softWrap: false,
+                                softWrap: CommonTextStyle.defaultSoftWrap,
+                                overflow: CommonTextStyle.defaultTextOverFlow,
                                 maxLines: 1,
                                 style: TextStyle(
                                     fontSize: 15,
-                                    overflow: TextOverflow.fade,
+                                    overflow: CommonTextStyle.defaultTextOverFlow,
                                     color: _buildTextColorForReadEmail(),
                                     fontWeight: _buildFontForReadEmail()))
                       ),
@@ -352,6 +362,8 @@ class EmailTileBuilder {
                             : Text(
                                 _presentationEmail.getEmailTitle(),
                                 maxLines: 1,
+                                softWrap: CommonTextStyle.defaultSoftWrap,
+                                overflow: CommonTextStyle.defaultTextOverFlow,
                                 style: TextStyle(
                                     fontSize: 13,
                                     color: _buildTextColorForReadEmail()))
@@ -370,6 +382,8 @@ class EmailTileBuilder {
                               child: Text(
                                 _presentationEmail.mailboxName,
                                 maxLines: 1,
+                                softWrap: CommonTextStyle.defaultSoftWrap,
+                                overflow: CommonTextStyle.defaultTextOverFlow,
                                 style: const TextStyle(
                                     fontSize: 10,
                                     color: AppColor.mailboxTextColor,
@@ -402,6 +416,8 @@ class EmailTileBuilder {
                           : Text(
                               _presentationEmail.getPartialContent(),
                               maxLines: 1,
+                              softWrap: CommonTextStyle.defaultSoftWrap,
+                              overflow: CommonTextStyle.defaultTextOverFlow,
                               style: const TextStyle(
                                   fontSize: 13,
                                   color: AppColor.colorContentEmail))
@@ -504,11 +520,12 @@ class EmailTileBuilder {
                            backgroundColor: AppColor.bgWordSearch)).build()
                   : Text(_getInformationSender(),
                       maxLines: 1,
-                      softWrap: false,
+                      softWrap: CommonTextStyle.defaultSoftWrap,
+                      overflow: CommonTextStyle.defaultTextOverFlow,
                       style: TextStyle(
                           fontSize: 15,
                           color: _buildTextColorForReadEmail(),
-                          overflow: TextOverflow.fade,
+                          overflow: CommonTextStyle.defaultTextOverFlow,
                           fontWeight: _buildFontForReadEmail())),
             ),
             const SizedBox(width: 24),
@@ -634,6 +651,8 @@ class EmailTileBuilder {
                 color: AppColor.backgroundCounterMailboxColor),
             child: Text(_presentationEmail.mailboxName,
               maxLines: 1,
+              softWrap: CommonTextStyle.defaultSoftWrap,
+              overflow: CommonTextStyle.defaultTextOverFlow,
               style: const TextStyle(
                   fontSize: 10,
                   color: AppColor.mailboxTextColor,
@@ -653,6 +672,8 @@ class EmailTileBuilder {
                   .getReceivedAt(Localizations.localeOf(_context)
                   .toLanguageTag()),
               maxLines: 1,
+              softWrap: CommonTextStyle.defaultSoftWrap,
+              overflow: CommonTextStyle.defaultTextOverFlow,
               style:  TextStyle(
                   fontSize: 13,
                   color: _buildTextColorForReadEmail(),
@@ -677,6 +698,8 @@ class EmailTileBuilder {
                 .getReceivedAt(Localizations.localeOf(_context)
                 .toLanguageTag()),
               maxLines: 1,
+              softWrap: CommonTextStyle.defaultSoftWrap,
+              overflow: CommonTextStyle.defaultTextOverFlow,
               style: const TextStyle(
                   fontSize: 13,
                   color: AppColor.colorContentEmail))),
@@ -708,6 +731,8 @@ class EmailTileBuilder {
                          fontWeight: _buildFontForReadEmail())).build()
                 : Text(_presentationEmail.getEmailTitle(),
                     maxLines: 1,
+                    softWrap: CommonTextStyle.defaultSoftWrap,
+                    overflow: CommonTextStyle.defaultTextOverFlow,
                     style:  TextStyle(
                         fontSize: 13,
                         color: _buildTextColorForReadEmail(),
@@ -731,6 +756,8 @@ class EmailTileBuilder {
                             backgroundColor: AppColor.bgWordSearch)).build()
                     : Text(_presentationEmail.getPartialContent(),
                         maxLines: 1,
+                        softWrap: CommonTextStyle.defaultSoftWrap,
+                        overflow: CommonTextStyle.defaultTextOverFlow,
                         style: const TextStyle(
                             fontSize: 13,
                             color: AppColor.colorContentEmail,