diff --git a/lib/features/composer/presentation/composer_view.dart b/lib/features/composer/presentation/composer_view.dart
index a29ad1a04..1013c4256 100644
--- a/lib/features/composer/presentation/composer_view.dart
+++ b/lib/features/composer/presentation/composer_view.dart
@@ -33,14 +33,12 @@ class ComposerView extends GetWidget<ComposerController> {
             mainAxisSize: MainAxisSize.max,
             children: [
               _buildTopBar(context),
-              _buildEmailHeaderField(context),
-              Expanded(child: GestureDetector(
-                onTap: () => keyboardUtils.hideKeyboard(context),
+              Expanded(
                 child: Container(
                   color: AppColor.bgComposer,
-                  child: _buildEmailBody(context),
-                ),
-              ))
+                  margin: EdgeInsets.zero,
+                  alignment: Alignment.topCenter,
+                  child: _buildEmailBody(context)))
             ])
         )
       ),
@@ -49,7 +47,7 @@ class ComposerView extends GetWidget<ComposerController> {
 
   Widget _buildTopBar(BuildContext context) {
     return Padding(
-      padding: EdgeInsets.only(left: 20, right: 24, top: 12, bottom: 12),
+      padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
       child: Obx(() => (TopBarComposerWidgetBuilder(imagePaths, controller.isEnableEmailSendButton.value)
           ..addSendEmailActionClick(() => controller.sendEmailAction(context))
           ..addBackActionClick(() => controller.backToEmailViewAction()))
@@ -119,15 +117,15 @@ class ComposerView extends GetWidget<ComposerController> {
 
   Widget _buildEmailBody(BuildContext context) {
     return SingleChildScrollView(
-      physics : ClampingScrollPhysics(),
-      child: Container(
-        margin: EdgeInsets.zero,
-        color: AppColor.bgComposer,
-        padding: controller.getEmailActionType() != EmailActionType.compose 
-          ? EdgeInsets.only(bottom: 30, left: 16, right: 16)
-          : EdgeInsets.only(bottom: 30),
-        alignment: Alignment.topCenter,
-        child: _buildEmailBodyEditorQuoted(context)
+      physics: ClampingScrollPhysics(),
+      child: Column(
+        children: [
+          _buildEmailHeaderField(context),
+          Padding(
+            padding: EdgeInsets.only(bottom: 30, top: 16, left: 16, right: 16),
+            child: _buildEmailBodyEditorQuoted(context),
+          )
+        ]
       )
     );
   }
diff --git a/lib/features/composer/presentation/widgets/top_bar_composer_widget_builder.dart b/lib/features/composer/presentation/widgets/top_bar_composer_widget_builder.dart
index 6bfb15171..f22022f57 100644
--- a/lib/features/composer/presentation/widgets/top_bar_composer_widget_builder.dart
+++ b/lib/features/composer/presentation/widgets/top_bar_composer_widget_builder.dart
@@ -63,9 +63,9 @@ class TopBarComposerWidgetBuilder {
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
         ButtonBuilder(_imagePaths.icComposerFileShare).key(Key('button_file_share')).build(),
-        SizedBox(width: 10),
+        SizedBox(width: 2),
         ButtonBuilder(_imagePaths.icShare).key(Key('button_attachment')).build(),
-        SizedBox(width: 10),
+        SizedBox(width: 2),
         ButtonBuilder(_imagePaths.icComposerSend)
           .key(Key('button_send_email'))
           .color(_isEnableEmailSendButton ? AppColor.enableSendEmailButtonColor : AppColor.disableSendEmailButtonColor)
@@ -74,7 +74,7 @@ class TopBarComposerWidgetBuilder {
               _onSendEmailActionClick!();
             }})
           .build(),
-        SizedBox(width: 10),
+        SizedBox(width: 2),
         ButtonBuilder(_imagePaths.icComposerMenu).key(Key('button_menu_composer')).build(),
       ]
     );