diff --git a/core/lib/presentation/extensions/color_extension.dart b/core/lib/presentation/extensions/color_extension.dart
index 46487fa1d..0a0bde5b4 100644
--- a/core/lib/presentation/extensions/color_extension.dart
+++ b/core/lib/presentation/extensions/color_extension.dart
@@ -123,6 +123,9 @@ extension AppColor on Color {
   static const colorBackgroundTagFilter = Color(0x6D7885);
   static const colorDefaultRichTextButton = Color(0xFF99A2AD);
   static const colorFocusRichTextButton = Color(0x146D7885);
+  static const colorStyleBlockQuote = Color(0xFFEEEEEE);
+  static const colorBorderStyleCode = Color(0xFFCCCCCC);
+  static const colorBackgroundStyleCode = Color(0xFFF5F5F5);
 
   static const mapGradientColor = [
     [Color(0xFF21D4FD), Color(0xFFB721FF)],
diff --git a/core/lib/presentation/utils/html_transformer/html_template.dart b/core/lib/presentation/utils/html_transformer/html_template.dart
index d0b96dc0b..8a26b0db1 100644
--- a/core/lib/presentation/utils/html_transformer/html_template.dart
+++ b/core/lib/presentation/utils/html_transformer/html_template.dart
@@ -62,4 +62,30 @@ String generateHtml(String content, {
     </body>
     </html> 
   ''';
-}
\ No newline at end of file
+}
+
+final bodyCssStyleForEditor = '''
+  <style>
+      blockquote {
+        margin-left: 8px;
+        margin-right: 8px;
+        padding-left: 12px;
+        padding-right: 12px;
+        border-left: 5px solid #eee;
+      }
+      pre {
+        display: block;
+        padding: 10px;
+        margin: 0 0 10px;
+        font-size: 13px;
+        line-height: 1.5;
+        color: #333;
+        word-break: break-all;
+        word-wrap: break-word;
+        background-color: #f5f5f5;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        overflow: auto;
+      }
+  </style>
+''';
\ No newline at end of file
diff --git a/lib/features/base/widget/drop_down_button_widget.dart b/lib/features/base/widget/drop_down_button_widget.dart
index 4e5b468f4..16bb2b3f6 100644
--- a/lib/features/base/widget/drop_down_button_widget.dart
+++ b/lib/features/base/widget/drop_down_button_widget.dart
@@ -62,7 +62,8 @@ class DropDownButtonWidget<T> extends StatelessWidget {
               .map((item) => DropdownMenuItem<T>(
                     value: item,
                     child: PointerInterceptor(
-                      child: SizedBox(
+                      child: Container(
+                        color: Colors.transparent,
                         height: heightItem,
                         child: Row(children: [
                           Expanded(child: Text(_getTextItemDropdown(context, item: item),
diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart
index 4b02efe66..c7dcf611a 100644
--- a/lib/features/composer/presentation/composer_view_web.dart
+++ b/lib/features/composer/presentation/composer_view_web.dart
@@ -16,9 +16,11 @@ import 'package:tmail_ui_user/features/composer/presentation/composer_controller
 import 'package:tmail_ui_user/features/composer/presentation/mixin/rich_text_button_mixin.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/dropdown_menu_font_status.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/font_name_type.dart';
+import 'package:tmail_ui_user/features/composer/presentation/model/header_style_type.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/rich_text_style_type.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/screen_display_mode.dart';
 import 'package:tmail_ui_user/features/composer/presentation/widgets/attachment_file_composer_builder.dart';
+import 'package:tmail_ui_user/features/composer/presentation/widgets/drop_down_menu_header_style_widget.dart';
 import 'package:tmail_ui_user/features/composer/presentation/widgets/email_address_input_builder.dart';
 import 'package:tmail_ui_user/features/upload/domain/state/attachment_upload_state.dart';
 import 'package:tmail_ui_user/features/upload/presentation/extensions/list_upload_file_state_extension.dart';
@@ -596,10 +598,10 @@ class ComposerView extends GetWidget<ComposerController>
           child: HtmlEditor(
             key: const Key('composer_editor_web'),
             controller: controller.richTextWebController.editorController,
-            htmlEditorOptions: const HtmlEditorOptions(
+            htmlEditorOptions: HtmlEditorOptions(
               hint: '',
               darkMode: false,
-            ),
+              customBodyCssStyle: bodyCssStyleForEditor),
             blockQuotedContent: initContent,
             htmlToolbarOptions: const HtmlToolbarOptions(
                 toolbarType: ToolbarType.hide,
@@ -625,6 +627,9 @@ class ComposerView extends GetWidget<ComposerController>
               if (controller.richTextWebController.isMenuFontOpen) {
                 controller.richTextWebController.closeDropdownMenuFont();
               }
+              if (controller.richTextWebController.isMenuHeaderStyleOpen) {
+                controller.richTextWebController.closeDropdownMenuHeaderStyle();
+              }
             }, onBlur: () {
               controller.onEditorFocusChange(false);
             }, onMouseDown: () {
@@ -756,7 +761,7 @@ class ComposerView extends GetWidget<ComposerController>
       padding: const EdgeInsets.only(left: 20, top: 8, bottom: 8),
       alignment: Alignment.centerLeft,
       child: Wrap(
-        alignment: WrapAlignment.center,
+        alignment: WrapAlignment.start,
         crossAxisAlignment: WrapCrossAlignment.center,
         children: RichTextStyleType.values.map((textType) => Obx(() {
           final opacity = controller.richTextWebController.codeViewEnabled ? 0.5 : 1.0;
@@ -813,6 +818,42 @@ class ComposerView extends GetWidget<ComposerController>
                   isSelected: controller.richTextWebController.isTextStyleTypeSelected(textType),
                   tooltip: textType.getTooltipButton(context),
                   onTap: () => controller.richTextWebController.toggleCodeView());
+            case RichTextStyleType.headerStyle:
+              return AbsorbPointer(
+                absorbing: controller.richTextWebController.codeViewEnabled,
+                child: Container(
+                    width: 50,
+                    height: 35,
+                    alignment: Alignment.center,
+                    padding: const EdgeInsets.only(right: 2),
+                    child: DropDownMenuHeaderStyleWidget(
+                        icon: Material(
+                          shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(5),
+                              side: const BorderSide(
+                                  color: AppColor.colorInputBorderCreateMailbox,
+                                  width: 0.5)),
+                          color: AppColor.colorInputBackgroundCreateMailbox,
+                          child: Tooltip(
+                            message: textType.getTooltipButton(context),
+                            child: Padding(
+                              padding: const EdgeInsets.only(left: 10, top: 10),
+                              child: SvgPicture.asset(textType.getIcon(imagePaths),
+                                  color: AppColor.colorDefaultRichTextButton.withOpacity(opacity),
+                                  fit: BoxFit.fill),
+                            ),
+                          ),
+                        ),
+                        items: HeaderStyleType.values,
+                        onMenuStateChange: (isOpen) {
+                          log('ComposerView::_buildToolbarRichTextWidget(): MenuHeaderStyleStatus: $isOpen');
+                          final newStatus = isOpen
+                              ? DropdownMenuFontStatus.open
+                              : DropdownMenuFontStatus.closed;
+                          controller.richTextWebController.menuHeaderStyleStatus = newStatus;
+                        },
+                        onChanged: (newStyle) => controller.richTextWebController.applyHeaderStyle(newStyle))),
+              );
             default:
               return AbsorbPointer(
                 absorbing: controller.richTextWebController.codeViewEnabled,