diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index 80c6238eb7d57a5741bfcc2f4f09328c37edc305..3d625597574271e3a6b3735554a1d3d4da9c7024 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -86,19 +86,23 @@ class AssignmentsController < ApplicationController
 
         @user.assignments.each do |assignment|
           session = assignment.session
-          other_users = session.assignments.map { |a| a.user.name }
-          other_users = other_users - [ @user.name ]
+          assignees = session.assignments.map { |a| a.user.name }
+          desc = [
+            "Assignees: #{assignees.join(', ')}",
+            "Speakers: #{session.speakers.map(&:name).join(', ')}",
+            session.description
+          ]
 
           event = Icalendar::Event.new
           event.dtstart = Icalendar::Values::DateTime.new(session.starts_at, tzid: session.starts_at.time_zone.tzinfo.name)
           event.dtend = Icalendar::Values::DateTime.new(session.ends_at, tzid: session.ends_at.time_zone.tzinfo.name)
           event.summary = [session.title, session.stage.name].join(' @ ')
-          event.description = other_users.join(', ') + "\n\n" + helpers.strip_tags(session.description)
+          event.description = desc.map { |l| helpers.strip_tags(l) }.join("\n\n")
           event.location = [session.stage.name, session.conference.name].join(' @ ')
           event.created = Icalendar::Values::DateTime.new(session.created_at)
           event.last_modified = Icalendar::Values::DateTime.new(session.updated_at)
           event.uid = [session.conference.slug, session.ref_id].join('-')
-          event.append_custom_property("X-ALT-DESC;FMTTYPE=text/html", other_users.join(', ') + "\n\n" + session.description)
+          event.append_custom_property("X-ALT-DESC;FMTTYPE=text/html", desc.join("<hr>"))
           calendar.add_event(event)
         end