diff --git a/app/views/event_invitation_mailer/attending.html.haml b/app/views/event_invitation_mailer/attending.html.haml
index 485abe4ea..f90ab6d69 100644
--- a/app/views/event_invitation_mailer/attending.html.haml
+++ b/app/views/event_invitation_mailer/attending.html.haml
@@ -26,6 +26,7 @@
               %td
                 %h4
                   #{@event.name}
+                  %br
                   %small #{humanize_date(@event.date_and_time, @event.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(event_invitation_url(@event.id, @invitation.token)), class: 'btn'
 
diff --git a/app/views/event_invitation_mailer/invite_coach.html.haml b/app/views/event_invitation_mailer/invite_coach.html.haml
index d102a146e..584cd989c 100644
--- a/app/views/event_invitation_mailer/invite_coach.html.haml
+++ b/app/views/event_invitation_mailer/invite_coach.html.haml
@@ -14,7 +14,7 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  We'd like to invite you to #{@event.name}. If you can come, please RSVP using the link in this email.
+                  We’re pleased to invite you to #{@event.name}. If you are able to attend, please RSVP using the link in this email below.
                 %p
                   #{@event.description.html_safe}.
 
@@ -24,7 +24,8 @@
               %td
                 %h4
                   #{@event.name}
-                  %small #{humanize_date(@event.date_and_time, @event.ends_at, with_time: true)}
+                %p 
+                  #{humanize_date(@event.date_and_time, @event.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(event_invitation_url(event_id: @event.slug, token: @invitation.token)), class: 'btn'
 
         - if @event.venue.present?
diff --git a/app/views/event_invitation_mailer/invite_student.html.haml b/app/views/event_invitation_mailer/invite_student.html.haml
index 4914c81b8..a3f473890 100644
--- a/app/views/event_invitation_mailer/invite_student.html.haml
+++ b/app/views/event_invitation_mailer/invite_student.html.haml
@@ -14,7 +14,7 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  We'd like to invite you to #{@event.name}. If you can come, please RSVP using the link in this email.
+                  We’re excited to invite you to #{@event.name}. If you can come, please RSVP using the link in this email.
                 %p
                   #{@event.description.html_safe}.
 
@@ -24,7 +24,8 @@
               %td
                 %h4
                   #{@event.name}
-                  %small #{humanize_date(@event.date_and_time, @event.ends_at, with_time: true)}
+                %p
+                  #{humanize_date(@event.date_and_time, @event.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(event_invitation_url(event_id: @event.slug, token: @invitation.token)), class: 'btn'
 
         - if @event.venue.present?
diff --git a/app/views/feedback_request_mailer/request_feedback.html.haml b/app/views/feedback_request_mailer/request_feedback.html.haml
index e769973d5..984ba92b9 100644
--- a/app/views/feedback_request_mailer/request_feedback.html.haml
+++ b/app/views/feedback_request_mailer/request_feedback.html.haml
@@ -14,13 +14,15 @@
               %td
                 %h3 Hi, #{@member.name}
                 %p.lead
-                  Thank you for attending our workshop!
+                  Thank you for attending our workshop, we hope you had a great time!
                 %p
                   We would love it if you could share your feedback with us. Your opinion and suggestions are very important in making our events better and improving what we are offering. Don't hesitate to write down any concerns you have.
 
                 %p
                   Feedback is completely anonymous and filling in the form should only take you a couple of minutes.
 
+                %p And, if you're able to, please consider making a #{link_to 'small donation', 'https://codebar.enthuse.com/donate/#!/' }. It would go a long way in supporting our mission and helping us continue to provide valuable opportunities for those who need them.
+
                 %p
                   We hope to see you again at our next workshop!
 
diff --git a/app/views/member_mailer/welcome_coach.html.haml b/app/views/member_mailer/welcome_coach.html.haml
index eebc9efb0..0707eed9d 100644
--- a/app/views/member_mailer/welcome_coach.html.haml
+++ b/app/views/member_mailer/welcome_coach.html.haml
@@ -1,16 +1,16 @@
 %h1 Hi #{@member.name}!
 
 %p
-  Welcome to codebar and thank you so much for volunteering. Coaches are a big part of our workshops’ success. We're looking forward to seeing you at one of our events soon.
+  Welcome to codebar! Thank you so much for volunteering your time as a coach. Coaches like you are at the heart of our workshops, and your involvement plays a vital role in their success. We can’t wait to see you at an event soon!
 
 %p
   - if @member.subscriptions.any?
     You'll receive email invitations to our workshops as soon as they are open for RSVP.
   - else
-    We send out invitations to our events via email.
+    We send out invitations to all our workshops and events via email.
     = link_to "Sign up on our subscriptions page", subscriptions_url
     to receive invitations to our workshops.
-  Places are limited, so be sure to respond quickly if you would like to attend.
+  Spots are limited, so respond promptly if you'd like to attend.
 
 %p
   %strong
@@ -32,22 +32,19 @@
   =link_to "tips for coaching on the codebar website.", teaching_guide_url
 
 %p
-  It's important to us that our workshops are a welcoming and accepting environment
-  for everyone. Please make sure you
-  = link_to "read our code of conduct", code_of_conduct_url
+  At codebar, fostering an inclusive and supportive space is our top priority. Please make sure you
+  = link_to "read our Code of Conduct", code_of_conduct_url
   before attending.
 
 %p
-  If you have any questions, reply to this email or chat to one of the organisers at
-  the workshop. They'll be at a table with the name stickers. They're there to help
-  with anything on your mind.
+  If you have questions, reply to this email or speak to an organiser at the workshop. You’ll find them at the table with the name stickers – they’re there to support you with anything you need.
 
 %p
-  If you didn't mean to sign up as a coach, not to worry! You can always
-  = link_to "change your subscriptions via our website here.", subscriptions_url
+  If you didn't mean to sign up as a coach, not to worry! You can update
+  = link_to "your subscription on our website here.", subscriptions_url
 
 %p
-  We hope to see you at a workshop soon, and thank you so much for volunteering!
+  Thank you once again for volunteering – your time and expertise make a huge difference. We look forward to seeing you at a workshop soon!
 
 %p
   #{"-- "}
diff --git a/app/views/member_mailer/welcome_student.html.haml b/app/views/member_mailer/welcome_student.html.haml
index 71f012f39..f329dca0d 100644
--- a/app/views/member_mailer/welcome_student.html.haml
+++ b/app/views/member_mailer/welcome_student.html.haml
@@ -1,45 +1,42 @@
 %h1 Hi #{@member.name}!
 
-%p Welcome to codebar. We're looking forward to seeing you at one of our events soon.
+%p Welcome to codebar! We’re excited to have you with us and look forward to seeing you at one of our upcoming events.
 
 %p
   - if @member.subscriptions.any?
     You'll receive email invitations to our events as soon as they are open for RSVP.
   - else
-    We send out invitations to our events via email.
+    We send out all invitations to our workshops and events via email.
     = link_to "Sign up on our subscriptions page", subscriptions_url
     to receive invitations to our workshops.
-  Places are limited, so be sure to respond quickly if you want to attend.
+  Spots are limited, so we encourage you to respond quickly if you’d like to attend.
 
 %p
-  If you accept an invitation and can no longer make it, please cancel your spot as soon as possible so we can allocate it to someone else. If you take a place on the waiting list, please keep that evening free and check your emails frequently. You will be notified at least three hours before the event if you receive a place.
+  If you’ve accepted an invitation but can no longer attend, please cancel your spot as soon as possible so we can offer it to someone else. If you’re on the waiting list, please keep the evening free and check your emails regularly. You’ll be notified at least three hours before the event if a spot becomes available.
 
 %p
-  Our workshops are available to women, non-binary, LGBTQ+, and people belonging to underrepresented ethnic groups in the tech industry. If you belong to one of these groups, you are more than welcome to attend. You can find out more about codebar's workshops
+  Our workshops are available to women, non-binary, LGBTQ+, and people belonging to underrepresented ethnic groups in the tech industry. If you identify with one of these groups, we’d love for you to join us. You can find out more about codebar's workshops
   = link_to "in our FAQ.", faq_url
 
 %p
-  Our workshops start with 30 minutes of socialising with food, before we assign
+  Our in-person workshops start with 30 minutes of socialising with food, before we assign
   you to a coach with one or two other students. You can either work through
   = link_to "one of our tutorials", "http://tutorials.codebar.io/"
   or get help with your own project.
 
 %p
-  It's important to us that our workshops are a welcoming and accepting environment
-  for everyone. Please make sure you
-  = link_to "read our code of conduct", attendance_policy_url
+  We believe in creating a welcoming and supportive environment for everyone. Please make sure you
+  = link_to "read our Code of Conduct", attendance_policy_url
   before attending.
 
 %p
-  If you didn't mean to sign up as a student, not to worry! You can always
-  = link_to "change your subscription on our website.", subscriptions_url
+  If you didn’t mean to sign up as a student or need to adjust your preferences, don’t worry! You can easily
+  = link_to "update your subscription on our website here.", subscriptions_url
 
 %p
-  If you have any questions, reply to this email or chat to one of the organisers at
-  the workshop. They'll be at a table with the name stickers. They're there to help
-  with anything on your mind.
+  If you have any questions before or during the workshop, feel free to reply to this email or speak to one of our organisers at the event. Look for the table with the name stickers – we’re here to help!
 
-%p We hope to see you at a workshop soon!
+%p We look forward to seeing you at one of our workshops soon!
 
 %p
   #{"-- "}
diff --git a/app/views/virtual_workshop_invitation_mailer/_how_to_join_info.html.haml b/app/views/virtual_workshop_invitation_mailer/_how_to_join_info.html.haml
index bbaf3c691..4a0cbb4b0 100644
--- a/app/views/virtual_workshop_invitation_mailer/_how_to_join_info.html.haml
+++ b/app/views/virtual_workshop_invitation_mailer/_how_to_join_info.html.haml
@@ -7,7 +7,7 @@
     %li= I18n.t('workshop.virtual.invitation.info.line_4_html', discord_app: link_to('https://discord.com/download', 'https://discord.com/download')).html_safe
   %br
 
-%h5= I18n.t('workshop.virtual.invitation.info.begins_title')
+%h4= I18n.t('workshop.virtual.invitation.info.begins_title')
 %ul
   %li= I18n.t('workshop.virtual.invitation.info.line_5')
   %li= I18n.t('workshop.virtual.invitation.info.line_6')
diff --git a/app/views/virtual_workshop_invitation_mailer/invite_coach.html.haml b/app/views/virtual_workshop_invitation_mailer/invite_coach.html.haml
index 3d88ec0f5..4cf0295a7 100644
--- a/app/views/virtual_workshop_invitation_mailer/invite_coach.html.haml
+++ b/app/views/virtual_workshop_invitation_mailer/invite_coach.html.haml
@@ -14,15 +14,19 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  Our next virtual #{@workshop.chapter.name} workshop is coming soon, and we’d like to invite you to join us as a coach
+                  We’re excited to invite you to join our upcoming virtual #{@workshop.chapter.name} workshop as a coach!
 
-                %p You will be helping students remotely as they work their way through one of our tutorials or a personal project they need help with. Not to worry, you’ll only be matched with students who you’ll be able to help based on your experience and expertise.
+                %p As a coach, you’ll support students remotely as they work through one of our #{link_to 'tutorials', 'http://tutorials.codebar.io/'} or seek guidance on a personal project. Don’t worry — you’ll only be paired with students whose needs align with your skills and expertise.
 
-                %p You can find all of our tutorials at #{link_to 'http://tutorials.codebar.io/', 'http://tutorials.codebar.io/'}. If you have any suggestions to improve our existing content, you can issue a pull request to our #{link_to 'GitHub repository', 'https://github.com/codebar/tutorials'}
+                %p You can explore all of our tutorials at #{link_to 'tutorials.codebar.io', 'http://tutorials.codebar.io/'}. If you have ideas for improving our content, feel free to contribute by submitting a pull request to our #{link_to 'GitHub repository', 'https://github.com/codebar/tutorials'}.
 
-                %p Before the workshop takes place, make sure that you have read and understood our #{link_to 'Code of Conduct', 'http://codebar.io/code-of-conduct'}. We have a zero tolerance policy towards negative conduct and expect everyone to behave appropriately. You should also go through our guide on #{link_to 'How to be an effective teacher.', 'http://codebar.io/effective-teacher-guide'}.
+                %p Before the workshop, please take a moment to:
 
-                %p Please note: We do not accept any RSVPs over email.
+                %ul
+                  %li Review our #{link_to 'Code of Conduct', 'http://codebar.io/code-of-conduct'}, which ensures a welcoming and respectful environment.
+                  %li Check out our guide on  #{link_to 'How to be an effective teacher.', 'http://codebar.io/effective-teacher-guide'}.
+
+                %p <strong>Please note:</strong> We do not accept any RSVPs over email.
 
                 %p.callout #{link_to 'Join us on Slack', 'https://slack.codebar.io'} to offer help and guidance outside the workshops.
 
@@ -33,7 +37,6 @@
                 %h4
                   =@workshop.to_s
                   %br
-                  %br
                   %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(invitation_url(@invitation)), class: 'btn'
               %td{ width: '40%', style: 'vertical-align: top;'}
diff --git a/app/views/virtual_workshop_invitation_mailer/invite_student.html.haml b/app/views/virtual_workshop_invitation_mailer/invite_student.html.haml
index 415ef39da..e7fa34878 100644
--- a/app/views/virtual_workshop_invitation_mailer/invite_student.html.haml
+++ b/app/views/virtual_workshop_invitation_mailer/invite_student.html.haml
@@ -13,11 +13,11 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  We’d love to have you at our next #{@workshop.chapter.name} virtual workshop.
+                  We’re excited to invite you to our next #{@workshop.chapter.name} virtual workshop.
                 %p
                   As part of our workshops, you’ll get to work through any of our #{link_to 'tutorials', 'http://codebar.github.io/tutorials' } or receive guidance on your personal project. We believe that everyone should be entitled to free learning and our community has #{ link_to 'a lot of devoted developers', full_url_for(coaches_url)} who help out as coaches.
                 %p You will also get the opportunity to interact with other people interested in coding and collaborate with them.
-                %p Please note: We do not accept any RSVPs over email.
+                %p <strong>Please note:</strong> We do not accept any RSVPs over email.
 
                 %p.callout If you are working through the tutorials outside our workshop, or need any other help or advice, please #{ link_to 'join the codebar Slack', 'https://slack.codebar.io'}.
 
@@ -26,6 +26,8 @@
             %tr
               %td{ width: '60%', style: 'vertical-align: top; padding-right: 20px;' }
                 %h4
+                  =@workshop.to_s
+                  %br
                   %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'View invitation and RSVP', full_url_for(invitation_url(@invitation)), class: 'btn'
               %td{ width: '40%', style: 'vertical-align: top;'}
diff --git a/app/views/virtual_workshop_invitation_mailer/waiting_list_reminder.html.haml b/app/views/virtual_workshop_invitation_mailer/waiting_list_reminder.html.haml
index b71959f50..771ee23a7 100644
--- a/app/views/virtual_workshop_invitation_mailer/waiting_list_reminder.html.haml
+++ b/app/views/virtual_workshop_invitation_mailer/waiting_list_reminder.html.haml
@@ -18,7 +18,7 @@
                 %p
                   If an attendee drops out, the next person on the waiting list will automatically get their place. We'll email you if this happens.
                   %strong Attendees often drop out at short notice,
-                  so you should keep the slot available and check your email during the afternoon on the day of the workshop.
+                  so you should keep keep an eye on your emails during the afternoon on the day of the workshop.
                 %p
                   Alternatively, if you know you can no longer make it, please
                   = link_to 'remove yourself from the waiting list', full_url_for(invitation_url(@invitation))
@@ -28,8 +28,7 @@
           %table{ bgcolor: '#FFFFFF' }
             %tr
               %td
-                %h4
-                  %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
+                %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update or cancel your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
 
         .content
diff --git a/app/views/workshop_invitation_mailer/attending.html.haml b/app/views/workshop_invitation_mailer/attending.html.haml
index 07bc25fda..59ad70b9e 100644
--- a/app/views/workshop_invitation_mailer/attending.html.haml
+++ b/app/views/workshop_invitation_mailer/attending.html.haml
@@ -26,7 +26,7 @@
                   %p
                     Please remember that removing the calendar entry will not cancel your invitation RSVP.
                   %p
-                    See you at our workshop!
+                    See you at the workshop!
 
 
         .content
@@ -35,7 +35,7 @@
               %td
                 %h4
                   Workshop
-                  %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
+                %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
 
         .content
diff --git a/app/views/workshop_invitation_mailer/attending_reminder.html.haml b/app/views/workshop_invitation_mailer/attending_reminder.html.haml
index 8efaf541c..44b5d3194 100644
--- a/app/views/workshop_invitation_mailer/attending_reminder.html.haml
+++ b/app/views/workshop_invitation_mailer/attending_reminder.html.haml
@@ -14,10 +14,9 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  This is a quick email to remind you that you have signed up for #{@workshop.day_temporal_pronoun}'s workshop.
+                  Just a quick reminder that you’ve signed up for #{@workshop.day_temporal_pronoun}'s workshop.
                 %p
-                  If you can no longer make it, please cancel your invitation before #{@workshop.day_temporal_pronoun} <strong>#{I18n.l(@workshop.rsvp_closing_date_and_time, format: :email_title)}</strong> so we can reallocate your spot to someone else.
-                  Remember that we have a <a href='https://codebar.io/student-guide#attendance'>three-strikes attendance policy</a> for no-shows.
+                  If you’re unable to attend, please cancel your spot by #{@workshop.day_temporal_pronoun} <strong>#{I18n.l(@workshop.rsvp_closing_date_and_time, format: :email_title)}</strong> so we can offer it to someone else. Remember that we have a <a href='https://codebar.io/student-guide#attendance'>three-strikes attendance policy</a> for no-shows.
                 %p
                   As most of our hosts are busy before the workshops begin, please do not turn up before #{(@workshop.date_and_time).strftime('%H:%M')} as you may not be allowed in. If you are early, we suggest waiting at a nearby cafe.
 
@@ -30,7 +29,8 @@
               %td
                 %h4
                   Workshop
-                  %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
+                  %br
+                  %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
 
         .content
diff --git a/app/views/workshop_invitation_mailer/invite_coach.html.haml b/app/views/workshop_invitation_mailer/invite_coach.html.haml
index 048d2886b..488107eb8 100644
--- a/app/views/workshop_invitation_mailer/invite_coach.html.haml
+++ b/app/views/workshop_invitation_mailer/invite_coach.html.haml
@@ -13,19 +13,19 @@
             %tr
               %td
                 %h3 Hi #{@member.name},
-                %p.lead
-                  Our next #{@workshop.chapter.name} workshop is coming soon, and we’d like to invite you to be a part of it.
+                %p.lead We’re excited to invite you to our next #{@workshop.chapter.name} workshop and would love for you to join us as a coach.
 
-                %p
-                  We’re looking for coaches to join us for our next workshop happening on #{humanize_date(@workshop.date_and_time, with_time: true)}.
+                %p As a coach, you’ll guide students as they work through one of our #{link_to 'tutorials', 'http://codebar.github.io/tutorials' } or seek help on a personal project. Rest assured, we’ll match you with a student based on your expertise and experience, ensuring a fulfilling and impactful coaching session for everyone involved.
 
-                %p As a coach you will be helping students as they work their way through one of our tutorials or a personal project that they need help with. Not to worry, you’ll only be matched with students who you’ll be able to help based on your experience and expertise.
+                %p You can find all of our tutorials at #{link_to 'http://tutorials.codebar.io/', 'http://tutorials.codebar.io/'}. If you spot areas for improvement, we’d appreciate your contributions via a pull request to our #{link_to 'GitHub repository', 'https://github.com/codebar/tutorials'}
 
-                %p You can find all of our tutorials at #{link_to 'http://tutorials.codebar.io/', 'http://tutorials.codebar.io/'}. If you have any suggestions to improve our existing content, you can issue a pull request to our #{link_to 'GitHub repository', 'https://github.com/codebar/tutorials'}
+                %h5 Before the Workshop
 
-                %p Before attending, make sure that you have read and understood our #{link_to 'Code of Conduct', 'http://codebar.io/code-of-conduct'}. We have a zero tolerance policy towards negative conduct and expect everyone to behave appropriately. You should also go through our guide on #{link_to 'How to be an effective teacher', 'http://codebar.io/effective-teacher-guide'}.
-
-                %p Please note: We do not accept any RSVPs over email.
+                %ul
+                  %li Please read and understand our #{link_to 'Code of Conduct', 'http://codebar.io/code-of-conduct'}. We are committed to creating a safe and inclusive environment, with zero tolerance for negative behavior.
+                  %li Review our guide on #{link_to 'How to be an effective teacher', 'http://codebar.io/effective-teacher-guide'} to make the most of your coaching experience.
+                 
+                %p <strong>Please note:</strong> We do not accept any RSVPs over email.
 
                 %p.callout #{link_to 'Join us on Slack', 'https://slack.codebar.io'} to offer help and guidance outside the workshops.
 
diff --git a/app/views/workshop_invitation_mailer/invite_student.html.haml b/app/views/workshop_invitation_mailer/invite_student.html.haml
index b8bd5fd42..dca8f5bbf 100644
--- a/app/views/workshop_invitation_mailer/invite_student.html.haml
+++ b/app/views/workshop_invitation_mailer/invite_student.html.haml
@@ -13,12 +13,16 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  We’d love to have you at our next #{@workshop.chapter.name} workshop. RSVP now to secure a spot, some light bites and time with a dedicated coach.
-                %p
-                  As part of our workshop, you'll get to work through any of our #{link_to 'tutorials', 'http://codebar.github.io/tutorials' } or receive guidance on your personal project. We believe that everyone should be entitled to free learning and our community has #{ link_to 'a lot of devoted developers', full_url_for(coaches_url)} who help out as coaches.
-                %p You will also get the opportunity to meet other people interested in coding and collaborate with them.
-                %p We’re looking forward to having you with us. See you there!
-                %p Please note: We do not accept any RSVPs over email.
+                  We’d love to see you at the next #{@workshop.chapter.name} workshop! Don’t miss this chance to secure your spot, enjoy some light refreshments, and work one-to-one or in a small group with a dedicated coach.
+                %p At the workshop, you’ll have the opportunity to:
+                %ul
+                  %li Work through our #{link_to 'tutorials', 'http://codebar.github.io/tutorials' } or get guidance on your personal projects.
+                  %li Connect and collaborate with others who share your passion for coding.
+                  %li Be part of a supportive community that believes learning should be accessible to everyone.
+                %p Our workshops are powered by a network of dedicated developers who volunteer their time to coach and guide participants like you.
+                %p We can’t wait to welcome you and support you on your coding journey. RSVP now, and we’ll see you there!
+                
+                %p <strong>Please note:</strong> We do not accept any RSVPs over email.
 
                 %p.callout If you are working through the tutorials outside our workshop, or need any other help or advice #{ link_to 'join the codebar Slack', 'https://slack.codebar.io'}.
 
@@ -36,6 +40,8 @@
                   Venue
                   %br
                   %small= @workshop.host.name
+                  %br
+                  %small= @workshop.address
                 = image_tag(@workshop.host.avatar.url, alt: @workshop.host.name)
 
         .content
diff --git a/app/views/workshop_invitation_mailer/notify_waiting_list.html.haml b/app/views/workshop_invitation_mailer/notify_waiting_list.html.haml
index 2dbab15b5..91aff5072 100644
--- a/app/views/workshop_invitation_mailer/notify_waiting_list.html.haml
+++ b/app/views/workshop_invitation_mailer/notify_waiting_list.html.haml
@@ -14,7 +14,7 @@
               %td
                 %h3 Hi #{@member.name},
                 %p.lead
-                  A spot just opened up for the workshop. If you would like to attend, please RSVP.
+                  A spot just opened up for you at the workshop. If you would like to attend, please RSVP.
 
         .content
           %table{ bgcolor: '#FFFFFF' }
@@ -22,7 +22,8 @@
               %td
                 %h4
                   Workshop
-                  %small #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
+                  %br
+                  %p #{humanize_date(@workshop.date_and_time, @workshop.ends_at, with_time: true)}
                 = link_to 'Update your attendance', full_url_for(invitation_url(@invitation)), class: 'btn'
 
         .content
diff --git a/app/views/workshop_invitation_mailer/waiting_list_reminder.html.haml b/app/views/workshop_invitation_mailer/waiting_list_reminder.html.haml
index 812cdc1f4..5aa662c9a 100644
--- a/app/views/workshop_invitation_mailer/waiting_list_reminder.html.haml
+++ b/app/views/workshop_invitation_mailer/waiting_list_reminder.html.haml
@@ -17,10 +17,9 @@
                   This is a quick email to remind you that you're on the waiting list for the workshop on #{humanize_date(@workshop.date_and_time, with_time: true)}.
                 %p
                   If an attendee drops out, the next person on the waiting list will automatically get their place. We'll email you if this happens.
-                  %strong Attendees often drop out at short notice,
-                  so you should keep your laptop with you and check your email during the afternoon on the day of the workshop.
+                  %strong Attendees often drop out at short notice, so you should keep an eye on your emails during the afternoon on the day of the workshop.
                 %p
-                  Alternatively, if you know you can no longer make it, you should
+                  Alternatively, if you can no longer make it, you should
                   = link_to 'remove yourself from the waiting list', full_url_for(invitation_url(@invitation))
                   so someone else can come to the workshop.
 
diff --git a/spec/mailers/member_mailer_spec.rb b/spec/mailers/member_mailer_spec.rb
index bca86a629..3ca7012c4 100644
--- a/spec/mailers/member_mailer_spec.rb
+++ b/spec/mailers/member_mailer_spec.rb
@@ -14,7 +14,7 @@
     end
 
     it 'renders the body' do
-      expect(mail.body.encoded).to match('Places are limited')
+      expect(mail.body.encoded).to match('Spots are limited')
     end
   end
 
diff --git a/spec/mailers/workshop_invitation_mailer_spec.rb b/spec/mailers/workshop_invitation_mailer_spec.rb
index 1f0e56621..615b81b8a 100644
--- a/spec/mailers/workshop_invitation_mailer_spec.rb
+++ b/spec/mailers/workshop_invitation_mailer_spec.rb
@@ -48,7 +48,7 @@
 
     expect(email.subject).to eq('A spot just became available')
     expect(email.from).to eq([workshop.chapter.email])
-    expect(email.body.encoded).to match('A spot just opened up for the workshop')
+    expect(email.body.encoded).to match('A spot just opened up for you at the workshop')
   end
 
   it '#waitlist_reminder' do