diff --git a/app/views/mailbot/comment_template.html.erb b/app/views/mailbot/comment_template.html.erb
new file mode 100644
index 00000000..2f5158e8
--- /dev/null
+++ b/app/views/mailbot/comment_template.html.erb
@@ -0,0 +1,14 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+ Dear <%= @user.name %>,
+
+ User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> .
+
+ "<%= @comment.body %>"
+
+ To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/comment_template.text.erb b/app/views/mailbot/comment_template.text.erb
deleted file mode 100644
index d162d710..00000000
--- a/app/views/mailbot/comment_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Email
-
-
-
-
-
-
-
-
-
-
-
-
- Dear <%= @user.name %>,
-
- User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> .
-
- "<%= @comment.body %>"
-
- To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
-
- Best wishes,
- <%= @conference.title %> Team
-
-
-
-
-
-
-
diff --git a/app/views/mailbot/ticket_confirmation_template.html.erb b/app/views/mailbot/ticket_confirmation_template.html.erb
new file mode 100644
index 00000000..51e83f9c
--- /dev/null
+++ b/app/views/mailbot/ticket_confirmation_template.html.erb
@@ -0,0 +1,12 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+ Dear <%= @user.name %>,
+
+ Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
+
+ Please, find the ticket(s) pdf attached.
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/ticket_confirmation_template.text.erb b/app/views/mailbot/ticket_confirmation_template.text.erb
deleted file mode 100644
index 0e4e54f8..00000000
--- a/app/views/mailbot/ticket_confirmation_template.text.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Email
-
-
-
-
-
-
-
-
-
-
-
-
- Dear <%= @user.name %>,
-
- Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
-
- Please, find the ticket(s) pdf attached.
-
- Best wishes,
- <%= @conference.title %> Team
-
-
-
-
-
-
-
diff --git a/app/views/mailbot/young_thinkers_ticket_confirmation_template.html.erb b/app/views/mailbot/young_thinkers_ticket_confirmation_template.html.erb
new file mode 100644
index 00000000..44d3c2a0
--- /dev/null
+++ b/app/views/mailbot/young_thinkers_ticket_confirmation_template.html.erb
@@ -0,0 +1,14 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+ Dear <%= @user.name %>,
+
+ Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
+
+ Please, find the ticket(s) pdf attached.
+
+ The SAP Young Thinkers team will reach out to you with information on how to participate in the event soon. In the meantime, you can check the event page (https://events.sap.com/yt-learning-festival-at-snapcon-2020/en/home) or send an email with your questions to youngthinkers@sap.com.
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb b/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
deleted file mode 100644
index 6a4c7fb5..00000000
--- a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Email
-
-
-
-
-
-
-
-
-
-
-
-
- Dear <%= @user.name %>,
-
- Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
-
- Please, find the ticket(s) pdf attached.
-
- The SAP Young Thinkers team will reach out to you with information on how to participate in the event soon. In the meantime, you can check the event page (https://events.sap.com/yt-learning-festival-at-snapcon-2020/en/home) or send an email with your questions to youngthinkers@sap.com.
-
- Best wishes,
- <%= @conference.title %> Team
-
-