Small adjustments to the From behaviour, send as Calendso or via user depending on who you are sending to.

.env.example

@@ -15,7 +15,7 @@ MS_GRAPH_CLIENT_SECRET=
 # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
 
 # Configures the global From: header whilst sending emails.
-EMAIL_FROM='Calendso <notifications@yourselfhostedcalendso.com>'
+EMAIL_FROM='notifications@yourselfhostedcalendso.com'
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).
 # Note: The below configuration for Office 365 has been verified to work.

lib/emails/confirm-booked.ts

@@ -31,7 +31,7 @@ const sendEmail = (calEvent: CalendarEvent, {
   nodemailer.createTransport(transport).sendMail(
     {
       to: `${calEvent.attendees[0].name} <${calEvent.attendees[0].email}>`,
-      from,
+      from: `${calEvent.organizer.name} <${from}>`,
       subject: `Confirmed: ${calEvent.type} with ${calEvent.organizer.name} on ${inviteeStart.format('dddd, LL')}`,
       html: html(calEvent),
       text: text(calEvent),

lib/emails/new-event.ts

@@ -66,7 +66,7 @@ const sendEmail = (calEvent: CalendarEvent, {
         filename: 'event.ics',
         content: icalEventAsString(calEvent),
       },
-      from,
+      from: `Calendso <${from}>`,
       to: calEvent.organizer.email,
       subject: `New event: ${calEvent.attendees[0].name} - ${organizerStart.format('LT dddd, LL')} - ${calEvent.type}`,
       html: html(calEvent),