diff --git a/frontend/client/src/views/email/detail.js b/frontend/client/src/views/email/detail.js
index 0063a27785..850e0ff1ab 100644
--- a/frontend/client/src/views/email/detail.js
+++ b/frontend/client/src/views/email/detail.js
@@ -307,7 +307,7 @@ Espo.define('views/email/detail', ['views/detail', 'email-helper'], function (De
             var attributes = emailHelper.getReplyAttributes(this.model, data, cc);
 
             this.notify('Loading...');
-            this.createView('quickCreate', 'Modals.ComposeEmail', {
+            this.createView('quickCreate', 'views/modals/compose-email', {
                 attributes: attributes,
             }, function (view) {
                 view.render(function () {
@@ -315,7 +315,11 @@ Espo.define('views/email/detail', ['views/detail', 'email-helper'], function (De
                 });
 
                 view.notify(false);
-            });
+
+                this.listenToOnce(view, 'after:save', function () {
+                    this.model.trigger('reply');
+                }, this);
+            }, this);
         },
 
         actionReplyToAll: function () {
diff --git a/frontend/client/src/views/email/record/detail-side.js b/frontend/client/src/views/email/record/detail-side.js
index aa26093c2f..fd6db0f97f 100644
--- a/frontend/client/src/views/email/record/detail-side.js
+++ b/frontend/client/src/views/email/record/detail-side.js
@@ -34,12 +34,12 @@ Espo.define('views/email/record/detail-side', 'views/record/detail-side', functi
             {
                 name: 'default',
                 label: false,
-                view: 'Record.Panels.DefaultSide',
+                view: 'views/record/panels/default-side',
                 options: {
                     fieldList: [
                         {
                             name: 'teams',
-                            view: 'Fields.Teams'
+                            view: 'views/fields/teams'
                         },
                         'replied',
                         'replies'
diff --git a/frontend/client/src/views/email/record/detail.js b/frontend/client/src/views/email/record/detail.js
index de2fc0a7d1..957d71d474 100644
--- a/frontend/client/src/views/email/record/detail.js
+++ b/frontend/client/src/views/email/record/detail.js
@@ -30,7 +30,7 @@ Espo.define('views/email/record/detail', 'views/record/detail', function (Dep) {
 
     return Dep.extend({
 
-        sideView: 'Email.Record.DetailSide',
+        sideView: 'views/email/record/detail-side',
 
         layoutNameConfigure: function () {
             if (!this.model.isNew()) {
@@ -98,6 +98,11 @@ Espo.define('views/email/record/detail', 'views/record/detail', function (Dep) {
                     this.showActionItem('markAsImportant');
                 }
             }, this);
+
+            this.listenTo(this.model, 'reply', function () {
+                this.showField('replies');
+                this.model.fetch();
+            }, this);
         },
 
         actionMarkAsImportant: function () {
diff --git a/frontend/client/src/views/modals/compose-email.js b/frontend/client/src/views/modals/compose-email.js
index 07ed099beb..082564272c 100644
--- a/frontend/client/src/views/modals/compose-email.js
+++ b/frontend/client/src/views/modals/compose-email.js
@@ -26,7 +26,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('Views.Modals.ComposeEmail', 'Views.Modals.Edit', function (Dep) {
+Espo.define('views/modals/compose-email', 'views/modals/edit', function (Dep) {
 
     return Dep.extend({
 
@@ -38,7 +38,7 @@ Espo.define('Views.Modals.ComposeEmail', 'Views.Modals.Edit', function (Dep) {
 
         fullFormDisabled: true,
 
-        editViewName: 'Email.Record.Compose',
+        editViewName: 'views/email/record/compose',
 
         columnCount: 2,