--- a/plugins/calendar/calendar_ui.js	Sat Jan 13 09:45:02 2018 -0500
+++ b/plugins/calendar/calendar_ui.js	Sat Jan 13 17:06:41 2018 -0500
@@ -399,8 +399,7 @@
       if (event.location)
         $('#event-location').html('@ ' + text2html(event.location)).show();
       if (event.description)
-        $('#event-description').show().html(event.description);
-                                     //children('.event-text').html(text2html(event.description, 300, 6));
+        $('#event-description').show().children('.event-text').html(text2html(event.description, 300, 6));
       if (event.vurl)
         $('#event-url').show().children('.event-text').html(render_link(event.vurl));
       
@@ -671,6 +670,7 @@
       // event details
       var title = $('#edit-title').val(event.title || '');
       var location = $('#edit-location').val(event.location || '');
+      var description = $('#edit-description').text(event.description || '');
       var vurl = $('#edit-url').val(event.vurl || '');
       var categories = $('#edit-categories').val(event.categories);
       var calendars = $('#edit-calendar').val(event.calendar);
@@ -722,16 +722,12 @@
         $('<option>').attr('value', event.categories).text(event.categories).appendTo(categories).prop('selected', true);
       }
 
-      var description;
       if ($.isArray(event.links) && event.links.length) {
-	render_message_links(event.links, $('#edit-event-links .event-text'), true, 'calendar');
-	// hack! database_driver doesn't save the links property :-(
-	description = $('#edit-description').html("<div><a href='"+event.links[0].mailurl+"'>"+event.links[0].subject+"</a>\n<textarea class='text' rows='5' cols='40'>"+(event.description || '')+"</textarea></div>");
-	$('#edit-event-links').show();
+          render_message_links(event.links, $('#edit-event-links .event-text'), true, 'calendar');
+          $('#edit-event-links').show();
       }
       else {
-	description = $('#edit-description').html("<div><textarea class='text' rows='5' cols='40'>"+(event.description || '')+"</textarea></div>");
-        $('#edit-event-links').hide();
+          $('#edit-event-links').hide();
       }
 
       // show warning if editing a recurring event