diff --git a/employee/cbv/accessibility.py b/employee/cbv/accessibility.py
index 91cf2c3bf..0a9a586b6 100644
--- a/employee/cbv/accessibility.py
+++ b/employee/cbv/accessibility.py
@@ -108,10 +108,11 @@ def note_accessibility(
     """
     accessibility for note tab
     """
-    if request.user.has_perm("employee.view_employeenote") or check_manager(
-        request.user.employee_get, instance
-    ):
-        return True
+    if instance.employee_user_id != request.user or request.user.is_superuser:
+        if request.user.has_perm("employee.view_employeenote") or check_manager(
+            request.user.employee_get, instance
+        ):
+            return True
     return False
 
 
diff --git a/recruitment/templates/pipeline/pipeline_components/send_mail.html b/recruitment/templates/pipeline/pipeline_components/send_mail.html
index f7c8ed38a..443c86d50 100644
--- a/recruitment/templates/pipeline/pipeline_components/send_mail.html
+++ b/recruitment/templates/pipeline/pipeline_components/send_mail.html
@@ -79,21 +79,24 @@
                 </select>
             </div>
 
-            <div class="oh-input__group">
-                <div class="oh-tabs__view-buttons mt-2">
-                    <span class="tab-btn active" data-tab="write">
-                        <span>{% trans 'Write' %}</span>
-                    </span>
-                    <span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
-                        <span>{% trans 'Preview' %}</span>
-                    </span>
-                </div>
-                <div id="write" class="oh-tabs__view active">
-                    <textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
-                        data-summernote required placeholder="Type something here..."></textarea>
-                </div>
-                <div id="preview" class="oh-tabs__view">
-                    <textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
+            <div class="form-group mt-2">
+                <label for="body"><h6>{% trans "Message Body" %}</h6></label>
+                <div class="oh-input__group">
+                    <div class="oh-tabs__view-buttons mt-2">
+                        <span class="tab-btn active" data-tab="write">
+                            <span>{% trans 'Write' %}</span>
+                        </span>
+                        <span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
+                            <span>{% trans 'Preview' %}</span>
+                        </span>
+                    </div>
+                    <div id="write" class="oh-tabs__view active">
+                        <textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
+                            data-summernote required placeholder="Type something here..."></textarea>
+                    </div>
+                    <div id="preview" class="oh-tabs__view">
+                        <textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
+                    </div>
                 </div>
             </div>
             {% if cand %}
@@ -189,10 +192,18 @@
                 data: { "candidate_id": "{{cand.id}}" },
                 dataType: "Json",
                 success: function (response) {
-                    $(`#objectCreateModalTarget [name="body"]`).html(response.body).change();
-                    $(`#objectCreateModalTarget [class="note-editable"]`).html(response.body);
-                    $('#previewHxButton').click();
+
+                // Update Summernote value correctly
+                if ($('#writeField').next('.note-editor').length) {
+                    $('#writeField').summernote('code', response.body);
+                } else {
+                    // Fallback if summernote not initialized yet
+                    $('#writeField').val(response.body);
                 }
+
+                // Trigger preview refresh
+                $('#previewHxButton').click();
+            }
             });
         }
     }