diff --git a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
index e97a278c1..85e9c36ca 100644
--- a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
@@ -1,16 +1,23 @@
 <% if @message.content_attributes&.dig('forwarded_message_id').present? %>  
-  <% if @message.content_attributes&.dig('email').present? %>
-    <% if @message.content_attributes.dig('email', 'html_content', 'full').present? %>
-      <%= @message.content_attributes.dig('email', 'html_content', 'full').html_safe %>
-    <% elsif @message.content_attributes.dig('email', 'text_content', 'full').present? %>
+  <% if @message.content_attributes&.dig('email', 'html_content', 'full').present? %>
+    <%= @message.content_attributes.dig('email', 'html_content', 'full').html_safe %>
+  <% elsif @message.content_attributes&.dig('email', 'text_content', 'full').present? %>
+    <div>
       <%= simple_format(@message.content_attributes.dig('email', 'text_content', 'full')) %>
-    <% end %>
+    </div>
+  <% elsif @message.content %>
+    <div>
+      <%= ChatwootMarkdownRenderer.new(@message.content).render_message.html_safe %>
+    </div>
   <% end %>
 <% else %>
   <% if @message.content %>
-    <%= ChatwootMarkdownRenderer.new(@message.content).render_message %>
+    <div>
+      <%= ChatwootMarkdownRenderer.new(@message.content).render_message.html_safe %>
+    </div>
   <% end %>
 <% end %>
+
 <% if @large_attachments.present? %>
   <p>Attachments:</p>
   <% @large_attachments.each do |attachment| %>
diff --git a/app/views/mailers/conversation_reply_mailer/email_reply.text.erb b/app/views/mailers/conversation_reply_mailer/email_reply.text.erb
new file mode 100644
index 000000000..d2b2bab13
--- /dev/null
+++ b/app/views/mailers/conversation_reply_mailer/email_reply.text.erb
@@ -0,0 +1,18 @@
+<% if @message.content_attributes&.dig('forwarded_message_id').present? %>  
+  <% if @message.content_attributes&.dig('email', 'text_content', 'full').present? %>
+    <%= @message.content_attributes&.dig('email', 'text_content', 'full') %>
+  <% elsif @message.content %>
+    <%= @message.content %>
+  <% end %>
+<% else %>
+  <% if @message.content %>
+    <%= @message.content %>
+  <% end %>
+<% end %>
+
+<% if @large_attachments.present? %>
+  Attachments:
+  <% @large_attachments.each do |attachment| %>
+    <%= attachment.file.filename.to_s %>: <%= attachment.file_url %>
+  <% end %>
+<% end %>